[Libreoffice-commits] core.git: Changes to 'refs/changes/29/3629/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/5029/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/5029/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/3629/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/3629/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/01/5201/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/5871/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/5871/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/4030/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/4030/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/01/5201/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/4030/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/06/3406/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docfmt.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f0dc2d755932b00b83db884334bcd0741056c884 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Mon Mar 17 13:53:51 2014 +0300 Fix fdo#75936 set limit for decreasing indent Change-Id: I566f93f7e6f9a5bcff75094b51aaa4ee79e6890e diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index d2af898..3227260 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -2343,7 +2343,8 @@ void SwDoc::MoveLeftMargin( const SwPaM rPam, bool bRight, bool bModulus ) if( bRight ) nNext += nDefDist; else -nNext -= nDefDist; +if(nNext 0) // fdo#75936 set limit for decreasing indent +nNext -= nDefDist; aLS.SetTxtLeft( nNext ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/sidebaralignment.ui | 122 +-- 1 file changed, 86 insertions(+), 36 deletions(-) New commits: commit aa02102fe9d338eb7d0774bd54feeac2142506ac Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Mon Oct 21 10:58:33 2013 +0300 Add writedirections buttons to calc sidebar fdo#67746 Change-Id: I5377f643f2ea6712724fdbf619f0b60bf78d619d diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui b/sc/uiconfig/scalc/ui/sidebaralignment.ui index cff8cca..228a25e 100644 --- a/sc/uiconfig/scalc/ui/sidebaralignment.ui +++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? interface !-- interface-requires gtk+ 3.0 -- + !-- interface-requires LibreOffice 1.0 -- object class=GtkGrid id=AlignmentPropertyPanel property name=visibleTrue/property property name=can_focusFalse/property @@ -19,58 +20,107 @@ property name=can_focusFalse/property property name=spacing12/property child - object class=GtkToolbar id=horizontalalignment + object class=GtkBox id=box8 property name=visibleTrue/property property name=can_focusFalse/property -property name=tooltip_text translatable=yesHorizontal Alignment/property -property name=show_arrowFalse/property child - object class=GtkToolButton id=substleft + object class=GtkToolbar id=horizontalalignment property name=visibleTrue/property property name=can_focusFalse/property -property name=valignstart/property -property name=action_name.uno:AlignLeft/property -property name=use_underlineTrue/property +property name=tooltip_text translatable=yesHorizontal Alignment/property +property name=show_arrowFalse/property +child + object class=GtkToolButton id=substleft +property name=visibleTrue/property +property name=can_focusFalse/property +property name=valignstart/property +property name=action_name.uno:AlignLeft/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=homogeneousTrue/property + /packing +/child +child + object class=GtkToolButton id=substcenter +property name=visibleTrue/property +property name=can_focusFalse/property +property name=action_name.uno:AlignHorizontalCenter/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=homogeneousTrue/property + /packing +/child +child + object class=GtkToolButton id=substright +property name=visibleTrue/property +property name=can_focusFalse/property +property name=action_name.uno:AlignRight/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=homogeneousTrue/property + /packing +/child +child + object class=GtkToolButton id=substjustify +property name=visibleTrue/property +property name=can_focusFalse/property +property name=action_name.uno:AlignBlock/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=homogeneousTrue/property + /packing +/child /object packing property name=expandFalse/property -property name=homogeneousTrue/property - /packing -/child -child - object class=GtkToolButton id=substcenter -property name=visibleTrue/property -property name=can_focusFalse/property -property name=action_name.uno:AlignHorizontalCenter/property
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/sidebarparagraph.ui | 210 ++-- svx/uiconfig/ui/sidebartextpanel.ui | 38 -- 2 files changed, 130 insertions(+), 118 deletions(-) New commits: commit a5aa1b29d5fb9a8a3045ba36fa0de4a0718bed54 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Tue Oct 8 14:51:40 2013 +0300 Move WriteDirection buttons to paragraph sidebar fdo#67746 Change-Id: I7a49e1ba9eb08c2fa79b80d572ef86ac5f76b9ca diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui index 691ee14..d702d15 100644 --- a/svx/uiconfig/ui/sidebarparagraph.ui +++ b/svx/uiconfig/ui/sidebarparagraph.ui @@ -16,86 +16,6 @@ property name=column_spacing6/property property name=column_homogeneousTrue/property child - object class=GtkToolbar id=horizontalalignment -property name=visibleTrue/property -property name=can_focusFalse/property -property name=has_tooltipTrue/property -property name=tooltip_markup translatable=yesHorizontal Alignment/property -property name=tooltip_text translatable=yesHorizontal Alignment/property -property name=halignstart/property -property name=show_arrowFalse/property -child - object class=GtkToolButton id=leftpara -property name=width_request25/property -property name=height_request25/property -property name=visibleTrue/property -property name=can_focusFalse/property -property name=has_tooltipTrue/property -property name=tooltip_markup translatable=yesAlign Left/property -property name=tooltip_text translatable=yesAlign Left/property -property name=valignstart/property -property name=action_name.uno:LeftPara/property -property name=use_underlineTrue/property - /object - packing -property name=expandFalse/property -property name=homogeneousTrue/property - /packing -/child -child - object class=GtkToolButton id=centerpara -property name=visibleTrue/property -property name=can_focusFalse/property -property name=has_tooltipTrue/property -property name=tooltip_markup translatable=yesAlign Center/property -property name=tooltip_text translatable=yesAlign Center/property -property name=action_name.uno:CenterPara/property -property name=use_underlineTrue/property - /object - packing -property name=expandFalse/property -property name=homogeneousTrue/property - /packing -/child -child - object class=GtkToolButton id=rightpara -property name=visibleTrue/property -property name=can_focusFalse/property -property name=has_tooltipTrue/property -property name=tooltip_markup translatable=yesAlign Right/property -property name=tooltip_text translatable=yesAlign Right/property -property name=action_name.uno:RightPara/property -property name=use_underlineTrue/property - /object - packing -property name=expandFalse/property -property name=homogeneousTrue/property - /packing -/child -child - object class=GtkToolButton id=substjustify -property name=visibleTrue/property -property name=can_focusFalse/property -property name=has_tooltipTrue/property -property name=tooltip_markup translatable=yesAlign Justified/property -property name=tooltip_text translatable=yesAlign Justified/property -property name=action_name.uno:JustifyPara/property -property name=use_underlineTrue/property - /object - packing -property name=expandFalse/property -property name=homogeneousTrue/property - /packing -/child - /object - packing -property name=left_attach0/property -property name=top_attach0/property -property name=width1/property -property name=height1/property - /packing -/child -child object class=GtkToolbar id=verticalalignment property name=visibleTrue/property property name=can_focusFalse/property @@ -688,6 +608,136 @@ property name=height1/property /packing /child +child + object class=GtkBox id=box1 +property name=visibleTrue
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/optlanguagespage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6e7380da285f9b248de189e63e18718c7de450b0 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Mon Sep 16 14:30:42 2013 +0300 add complex text layout for CTL option Change-Id: I0c9a0442bf617f397651ae0027c824d6f0709c14 diff --git a/cui/uiconfig/ui/optlanguagespage.ui b/cui/uiconfig/ui/optlanguagespage.ui index 1bae6d2..bf14d21 100644 --- a/cui/uiconfig/ui/optlanguagespage.ui +++ b/cui/uiconfig/ui/optlanguagespage.ui @@ -279,7 +279,7 @@ /child child object class=GtkCheckButton id=ctlsupport -property name=label translatable=yesC_TL/property +property name=label translatable=yesComplex _text layout (CTL)/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/sidebartextpanel.ui | 39 1 file changed, 39 insertions(+) New commits: commit d9e21015d28b03c5df73b4e819ed2a6fc85c3a7e Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Sun Sep 8 10:02:09 2013 +0300 Fix fdo#67746 SIDEBAR Feature request: RTL\LTR buttons Change-Id: I1684f0a4e66a395928f5fabcef0610867adb6eea Reviewed-on: https://gerrit.libreoffice.org/5871 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/svx/uiconfig/ui/sidebartextpanel.ui b/svx/uiconfig/ui/sidebartextpanel.ui index 0b81586..fd80e27 100644 --- a/svx/uiconfig/ui/sidebartextpanel.ui +++ b/svx/uiconfig/ui/sidebartextpanel.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? interface !-- interface-requires gtk+ 3.0 -- + !-- interface-requires LibreOffice 1.0 -- object class=GtkGrid id=SidebarTextPanel property name=visibleTrue/property property name=can_focusFalse/property @@ -185,6 +186,44 @@ property name=position1/property /packing /child +child + object class=sfxlo-SidebarToolBox id=writedirection +property name=visibleTrue/property +property name=can_focusFalse/property +property name=show_arrowFalse/property +child + object class=GtkToolButton id=lefttoright +property name=visibleTrue/property +property name=can_focusFalse/property +property name=is_importantTrue/property +property name=action_name.uno:ParaLeftToRight/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=homogeneousTrue/property + /packing +/child +child + object class=GtkToolButton id=righttoleft +property name=visibleTrue/property +property name=can_focusFalse/property +property name=is_importantTrue/property +property name=action_name.uno:ParaRightToLeft/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=homogeneousTrue/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child /object packing property name=expandFalse/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/AllLangResTarget_sc.mk |1 sc/UIConfig_scalc.mk |1 sc/source/ui/docshell/tpstat.cxx | 25 +--- sc/source/ui/docshell/tpstat.hrc | 30 - sc/source/ui/docshell/tpstat.src | 73 - sc/source/ui/inc/tpstat.hxx| 11 -- sc/uiconfig/scalc/ui/statisticsinfopage.ui | 156 + 7 files changed, 171 insertions(+), 126 deletions(-) New commits: commit 2ef249134e8696a15d2caf2eab5f2e5e211e01a7 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Mon Aug 5 03:13:54 2013 +0300 Convert statistics tab page for calc to .ui Change-Id: I950cf893875ec75668e17bd20bbe19369c132184 diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 5f43eb3..55ad9d2 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -59,7 +59,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/src/xmlsourcedlg.src \ sc/source/ui/cctrl/checklistmenu.src \ sc/source/ui/navipi/navipi.src \ -sc/source/ui/docshell/tpstat.src \ sc/source/ui/pagedlg/pagedlg.src \ sc/source/ui/styleui/scstyles.src \ sc/source/ui/styleui/styledlg.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index f180a53..43dee84 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -119,6 +119,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/sortoptionspage \ sc/uiconfig/scalc/ui/sortwarning \ sc/uiconfig/scalc/ui/subtotaloptionspage \ + sc/uiconfig/scalc/ui/statisticsinfopage \ sc/uiconfig/scalc/ui/textimportoptions \ sc/uiconfig/scalc/ui/textimportcsv \ sc/uiconfig/scalc/ui/tpviewpage \ diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 86f73fb..af7b636 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -25,7 +25,6 @@ #include document.hxx #include docsh.hxx #include scresid.hxx -#include tpstat.hrc #include tpstat.hxx @@ -42,29 +41,25 @@ SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet rSet ) // ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet rSet ) -: SfxTabPage( pParent, ScResId(RID_SCPAGE_STAT), rSet ), -aFlInfo ( this, ScResId( FL_INFO ) ), -aFtTablesLbl( this, ScResId( FT_TABLES_LBL ) ), -aFtTables ( this, ScResId( FT_TABLES ) ), -aFtCellsLbl ( this, ScResId( FT_CELLS_LBL ) ), -aFtCells( this, ScResId( FT_CELLS ) ), -aFtPagesLbl ( this, ScResId( FT_PAGES_LBL ) ), -aFtPages( this, ScResId( FT_PAGES ) ) +: SfxTabPage( pParent, StatisticsInfopage, modules/scalc/ui/statisticsinfopage.ui, rSet ) { +get(m_pFlInfo,document); +get(m_pFtTables,nosheets); +get(m_pFtCells,nocells); +get(m_pFtPages,nopages); ScDocShell* pDocSh = PTR_CAST( ScDocShell, SfxObjectShell::Current() ); ScDocStat aDocStat; if ( pDocSh ) pDocSh-GetDocStat( aDocStat ); -String aInfo = aFlInfo.GetText(); +String aInfo = m_pFlInfo-GetText(); aInfo += aDocStat.aDocName; -aFlInfo .SetText( aInfo ); -aFtTables .SetText( OUString::number( aDocStat.nTableCount ) ); -aFtCells.SetText( OUString::number( aDocStat.nCellCount ) ); -aFtPages.SetText( OUString::number( aDocStat.nPageCount ) ); +m_pFlInfo -SetText( aInfo ); +m_pFtTables -SetText( OUString::number( aDocStat.nTableCount ) ); +m_pFtCells-SetText( OUString::number( aDocStat.nCellCount ) ); +m_pFtPages-SetText( OUString::number( aDocStat.nPageCount ) ); -FreeResource(); } // diff --git a/sc/source/ui/docshell/tpstat.hrc b/sc/source/ui/docshell/tpstat.hrc deleted file mode 100644 index b5fd05f..000 --- a/sc/source/ui/docshell/tpstat.hrc +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http
[Libreoffice-commits] core.git: filter/AllLangResTarget_xsltdlg.mk filter/source filter/uiconfig filter/UIConfig_xsltdlg.mk
filter/AllLangResTarget_xsltdlg.mk |1 filter/UIConfig_xsltdlg.mk |1 filter/source/xsltdialog/xmlfilterhelpids.hrc|1 filter/source/xsltdialog/xmlfiltertabdialog.cxx | 13 - filter/source/xsltdialog/xmlfiltertabdialog.src |1 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx| 103 - filter/source/xsltdialog/xmlfiltertabpagexslt.hrc| 41 --- filter/source/xsltdialog/xmlfiltertabpagexslt.hxx| 28 +- filter/source/xsltdialog/xmlfiltertabpagexslt.src| 160 -- filter/uiconfig/ui/xmlfiltertabpagetransformation.ui | 217 +++ 10 files changed, 282 insertions(+), 284 deletions(-) New commits: commit 9ed24d6625e6e0c29a60a1b04a907243a5c35ca4 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Tue Jul 30 14:59:03 2013 +0300 Convert xml filter tabpage transformation to .ui Change-Id: Ice69f7d036d414c82f6c313a8dc025f736b97e68 Reviewed-on: https://gerrit.libreoffice.org/5201 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/filter/AllLangResTarget_xsltdlg.mk b/filter/AllLangResTarget_xsltdlg.mk index 5c79404..316d0a2 100644 --- a/filter/AllLangResTarget_xsltdlg.mk +++ b/filter/AllLangResTarget_xsltdlg.mk @@ -31,7 +31,6 @@ $(eval $(call gb_SrsTarget_set_include,filter/xsltdlg,\ $(eval $(call gb_SrsTarget_add_files,filter/xsltdlg,\ filter/source/xsltdialog/xmlfiltertabdialog.src \ - filter/source/xsltdialog/xmlfiltertabpagexslt.src \ filter/source/xsltdialog/xmlfilterdialogstrings.src \ )) diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk index bb12d74..a54c4e8 100644 --- a/filter/UIConfig_xsltdlg.mk +++ b/filter/UIConfig_xsltdlg.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_uifiles,filter,\ filter/uiconfig/ui/testxmlfilter \ filter/uiconfig/ui/xmlfiltersettings \ filter/uiconfig/ui/xmlfiltertabpagegeneral \ + filter/uiconfig/ui/xmlfiltertabpagetransformation \ )) # vim: set noet sw=4 ts=4: diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc b/filter/source/xsltdialog/xmlfilterhelpids.hrc index b2f18eb..b87c23f 100644 --- a/filter/source/xsltdialog/xmlfilterhelpids.hrc +++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc @@ -22,7 +22,6 @@ #define HID_XML_SOURCE_FILE_DIALOG FILTER_HID_XML_SOURCE_FILE_DIALOG #define HID_XML_FILTER_TABDIALOG FILTER_HID_XML_FILTER_TABDIALOG -#define HID_XML_FILTER_TABPAGE_XSLT FILTER_HID_XML_FILTER_TABPAGE_XSLT #define HID_XML_FILTER_NAME FILTER_HID_XML_FILTER_NAME #define HID_XML_FILTER_INTERFACE_NAME FILTER_HID_XML_FILTER_INTERFACE_NAME #define HID_XML_FILTER_EXTENSION FILTER_HID_XML_FILTER_EXTENSION diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 509204a..65ed311 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -26,7 +26,6 @@ #include xmlfilterdialogstrings.hrc #include xmlfiltertabdialog.hxx #include xmlfiltercommon.hrc -#include xmlfiltertabpagexslt.hrc #include xmlfiltertabpagebasic.hxx #include xmlfiltertabpagexslt.hxx #include xmlfiltersettingsdialog.hxx @@ -81,12 +80,12 @@ XMLFilterTabDialog::XMLFilterTabDialog( Window *pParent, ResMgr rResMgr, const aCtrlSiz = aSiz; } -mpXSLTPage = new XMLFilterTabPageXSLT( maTabCtrl, mrResMgr ); +mpXSLTPage = new XMLFilterTabPageXSLT( maTabCtrl); mpXSLTPage-SetInfo( mpNewInfo ); maTabCtrl.SetTabPage( RID_XML_FILTER_TABPAGE_XSLT, mpXSLTPage ); -aSiz = mpXSLTPage-GetSizePixel(); +aSiz = mpXSLTPage-GetOptimalSize(); if ( aCtrlSiz.Width() aSiz.Width() || aCtrlSiz.Height() aSiz.Height() ) { maTabCtrl.SetTabPageSizePixel( aSiz ); @@ -221,7 +220,7 @@ bool XMLFilterTabDialog::onOk() { nErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND; nErrorPage = RID_XML_FILTER_TABPAGE_XSLT; -pFocusWindow = (mpXSLTPage-maEDExportXSLT); +pFocusWindow = (mpXSLTPage-m_pEDExportXSLT); } } } @@ -237,7 +236,7 @@ bool XMLFilterTabDialog::onOk() { nErrorId = STR_ERROR_IMPORT_XSLT_NOT_FOUND; nErrorPage = RID_XML_FILTER_TABPAGE_XSLT; -pFocusWindow = (mpXSLTPage-maEDImportTemplate); +pFocusWindow = (mpXSLTPage-m_pEDImportTemplate); } } } @@ -247,7 +246,7 @@ bool XMLFilterTabDialog::onOk() { nErrorId = STR_ERROR_EXPORT_XSLT_NOT_FOUND; nErrorPage = RID_XML_FILTER_TABPAGE_XSLT; -pFocusWindow = (mpXSLTPage-maEDExportXSLT); +pFocusWindow
[Libreoffice-commits] core.git: filter/AllLangResTarget_xsltdlg.mk filter/source filter/uiconfig filter/UIConfig_xsltdlg.mk
filter/AllLangResTarget_xsltdlg.mk |1 filter/UIConfig_xsltdlg.mk |1 filter/source/xsltdialog/xmlfilterhelpids.hrc |1 filter/source/xsltdialog/xmlfiltertabdialog.cxx|5 filter/source/xsltdialog/xmlfiltertabdialog.src|1 filter/source/xsltdialog/xmlfiltertabpagebasic.cxx | 57 ++ filter/source/xsltdialog/xmlfiltertabpagebasic.hrc | 38 filter/source/xsltdialog/xmlfiltertabpagebasic.hxx | 18 -- filter/source/xsltdialog/xmlfiltertabpagebasic.src | 138 --- filter/uiconfig/ui/xmlfiltertabpagegeneral.ui | 182 + 10 files changed, 215 insertions(+), 227 deletions(-) New commits: commit af2d2b864ab53d7b5b267577f2f1137fd7946502 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Mon Jul 22 14:29:39 2013 +0300 Convert Xml-Filter-TabPage-General to .ui Change-Id: Ia2ce0ce28b8a078b99651b38bdd3cbeaea3d8772 Reviewed-on: https://gerrit.libreoffice.org/5029 Tested-by: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/filter/AllLangResTarget_xsltdlg.mk b/filter/AllLangResTarget_xsltdlg.mk index d90401e..5c79404 100644 --- a/filter/AllLangResTarget_xsltdlg.mk +++ b/filter/AllLangResTarget_xsltdlg.mk @@ -31,7 +31,6 @@ $(eval $(call gb_SrsTarget_set_include,filter/xsltdlg,\ $(eval $(call gb_SrsTarget_add_files,filter/xsltdlg,\ filter/source/xsltdialog/xmlfiltertabdialog.src \ - filter/source/xsltdialog/xmlfiltertabpagebasic.src \ filter/source/xsltdialog/xmlfiltertabpagexslt.src \ filter/source/xsltdialog/xmlfilterdialogstrings.src \ )) diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk index 0614899..bb12d74 100644 --- a/filter/UIConfig_xsltdlg.mk +++ b/filter/UIConfig_xsltdlg.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,filter,\ filter/uiconfig/ui/pdfviewpage \ filter/uiconfig/ui/testxmlfilter \ filter/uiconfig/ui/xmlfiltersettings \ + filter/uiconfig/ui/xmlfiltertabpagegeneral \ )) # vim: set noet sw=4 ts=4: diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc b/filter/source/xsltdialog/xmlfilterhelpids.hrc index 28333a4..9054679 100644 --- a/filter/source/xsltdialog/xmlfilterhelpids.hrc +++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc @@ -22,7 +22,6 @@ #define HID_XML_SOURCE_FILE_DIALOG FILTER_HID_XML_SOURCE_FILE_DIALOG #define HID_XML_FILTER_TABDIALOG FILTER_HID_XML_FILTER_TABDIALOG -#define HID_XML_FILTER_TABPAGE_BASIC FILTER_HID_XML_FILTER_TABPAGE_BASIC #define HID_XML_FILTER_TABPAGE_XSLT FILTER_HID_XML_FILTER_TABPAGE_XSLT #define HID_XML_FILTER_NAME FILTER_HID_XML_FILTER_NAME #define HID_XML_FILTER_APPLICATION FILTER_HID_XML_FILTER_APPLICATION diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index b7abdc7..9f51961 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -26,7 +26,6 @@ #include xmlfilterdialogstrings.hrc #include xmlfiltertabdialog.hxx #include xmlfiltercommon.hrc -#include xmlfiltertabpagebasic.hrc #include xmlfiltertabpagexslt.hrc #include xmlfiltertabpagebasic.hxx #include xmlfiltertabpagexslt.hxx @@ -140,7 +139,7 @@ bool XMLFilterTabDialog::onOk() { nErrorPage = RID_XML_FILTER_TABPAGE_BASIC; nErrorId = STR_ERROR_FILTER_NAME_EXISTS; -pFocusWindow = (mpBasicPage-maEDFilterName); +pFocusWindow = (mpBasicPage-m_pEDFilterName); aReplace1 = mpNewInfo-maFilterName; } @@ -195,7 +194,7 @@ bool XMLFilterTabDialog::onOk() { nErrorPage = RID_XML_FILTER_TABPAGE_BASIC; nErrorId = STR_ERROR_TYPE_NAME_EXISTS; -pFocusWindow = (mpBasicPage-maEDInterfaceName); +pFocusWindow = (mpBasicPage-m_pEDInterfaceName); aReplace1 = mpNewInfo-maInterfaceName; aReplace2 = *pFilterName; } diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.src b/filter/source/xsltdialog/xmlfiltertabdialog.src index 4f4f9b1..c9db6c0c 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.src +++ b/filter/source/xsltdialog/xmlfiltertabdialog.src @@ -18,7 +18,6 @@ */ #include xmlfiltercommon.hrc -#include xmlfiltertabpagebasic.hrc #include xmlfiltertabpagexslt.hrc #include xmlfilterhelpids.hrc diff --git
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit df9e6ab514ca1c97c7eb69e169c958619c03d429 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Sat Jun 29 19:37:58 2013 +0200 fdo#62601 Quick search affected by invisible option from the searchreplace Disable invisible options in (ctrl+h) search-and-replace dialog if quick search (ctrl+f) is used Change-Id: I600914ce89135e93d4808bb4a072618b00eb6f08 diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index a32c77b..9bbd734 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -48,6 +48,7 @@ static const char SEARCHITEM_SEARCHSTRING[] = SearchItem.SearchString; static const char SEARCHITEM_SEARCHBACKWARD[] = SearchItem.Backward; static const char SEARCHITEM_SEARCHFLAGS[] = SearchItem.SearchFlags; static const char SEARCHITEM_TRANSLITERATEFLAGS[] = SearchItem.TransliterateFlags; +static const char SEARCHITEM_ALGORITHMTYPE[] = SearchItem.AlgorithmType; static const char COMMAND_EXECUTESEARCH[] = .uno:ExecuteSearch; static const char COMMAND_FINDTEXT[] = .uno:FindText; @@ -92,7 +93,7 @@ void impl_executeSearch( const css::uno::Reference css::uno::XComponentContext } } -css::uno::Sequence css::beans::PropertyValue lArgs(5); +css::uno::Sequence css::beans::PropertyValue lArgs(6); lArgs[0].Name = OUString(SEARCHITEM_SEARCHSTRING); lArgs[0].Value = sFindText; lArgs[1].Name = OUString(SEARCHITEM_SEARCHBACKWARD); @@ -108,6 +109,8 @@ void impl_executeSearch( const css::uno::Reference css::uno::XComponentContext lArgs[4].Name = OUString(SEARCHITEM_COMMAND); lArgs[4].Value = (sal_Int16)(aFindAll ? SVX_SEARCHCMD_FIND_ALL : SVX_SEARCHCMD_FIND ); +lArgs[5].Name = OUString(SEARCHITEM_ALGORITHMTYPE); +lArgs[5].Value = (sal_Int16)0; // 0 == SearchAlgorithms_ABSOLUTE css::uno::Reference css::frame::XDispatchProvider xDispatchProvider(xFrame, css::uno::UNO_QUERY); if ( xDispatchProvider.is() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) New commits: commit 96456205067220cc73bffae6ae860dd120641660 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Tue Jun 25 10:30:58 2013 +0200 Add Ignore-Diacritics to find toolbar for CTL fdo#52204 Change-Id: I79cb4db1ec87258c45ddc786914b32f47e96acf5 diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index dcb3206..a32c77b 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -26,11 +26,13 @@ #include com/sun/star/beans/XPropertySet.hpp #include com/sun/star/frame/XLayoutManager.hpp #include com/sun/star/i18n/TransliterationModules.hpp +#include com/sun/star/i18n/TransliterationModulesExtra.hpp #include com/sun/star/text/XTextRange.hpp #include com/sun/star/ui/XUIElement.hpp #include com/sun/star/util/URL.hpp #include com/sun/star/util/URLTransformer.hpp +#include svl/ctloptions.hxx #include svl/srchitem.hxx #include toolkit/helper/vclunohelper.hxx #include vcl/toolbox.hxx @@ -98,8 +100,11 @@ void impl_executeSearch( const css::uno::Reference css::uno::XComponentContext lArgs[2].Name = OUString(SEARCHITEM_SEARCHFLAGS); lArgs[2].Value = (sal_Int32)0; lArgs[3].Name = OUString(SEARCHITEM_TRANSLITERATEFLAGS); -lArgs[3].Value = (sal_Int32)(!aMatchCase ? -com::sun::star::i18n::TransliterationModules_IGNORE_CASE : 0); +SvtCTLOptions aCTLOptions; +sal_Int32 nFlags = 0; +nFlags |= (!aMatchCase ? com::sun::star::i18n::TransliterationModules_IGNORE_CASE : 0); +nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::ignoreDiacritics_CTL:0 ); +lArgs[3].Value = nFlags; lArgs[4].Name = OUString(SEARCHITEM_COMMAND); lArgs[4].Value = (sal_Int16)(aFindAll ? SVX_SEARCHCMD_FIND_ALL : SVX_SEARCHCMD_FIND ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/transliteration/ignoreDiacritics_CTL.cxx | 18 --- 1 file changed, 10 insertions(+), 8 deletions(-) New commits: commit 64245c108aec557f62c254486aa354382bd445ce Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Mon Jun 24 10:08:36 2013 +0200 fdo#52204 add more diacritics for Arabic Change-Id: I916eb34b127699ea3251e92f4d7b705347ae5cba diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx index f4de2c5..4486d45 100644 --- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx +++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx @@ -17,14 +17,16 @@ ignoreDiacritics_CTL_translator (const sal_Unicode c) { switch (c) { //Arabic Diacritics -case 0x064B: -case 0x064C: -case 0x064D: -case 0x064E: -case 0x064F: -case 0x0650: -case 0x0651: -case 0x0652: +case 0x064B: // Fathahtan +case 0x064C: // Dammahtan +case 0x064D: // Kasrahtan +case 0x064E: // Fathah +case 0x064F: // Dammah +case 0x0650: // Kasrah +case 0x0651: // Shaddah +case 0x0652: // Sukun +case 0x0653: // Maddah +case 0x0670: // Dagger alif // no break; return 0x; // Skip this character } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/transliteration/ignoreDiacritics_CTL.cxx | 17 ++- 1 file changed, 3 insertions(+), 14 deletions(-) New commits: commit a089ed2bf90fdb293c8502e4ab47cbbe027234f8 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Mon Jun 24 11:59:44 2013 +0200 Better approach for solving fdo#52204 Change-Id: Iada36661abaef0363688a186f0542f62dfb1455c diff --git a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx index 4486d45..7f0b0ce 100644 --- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx +++ b/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx @@ -9,27 +9,16 @@ #define TRANSLITERATION_Diacritics_CTL #include transliteration_Ignore.hxx +#include unicode/uchar.h namespace com { namespace sun { namespace star { namespace i18n { sal_Unicode ignoreDiacritics_CTL_translator (const sal_Unicode c) { -switch (c) { -//Arabic Diacritics -case 0x064B: // Fathahtan -case 0x064C: // Dammahtan -case 0x064D: // Kasrahtan -case 0x064E: // Fathah -case 0x064F: // Dammah -case 0x0650: // Kasrah -case 0x0651: // Shaddah -case 0x0652: // Sukun -case 0x0653: // Maddah -case 0x0670: // Dagger alif -// no break; +if(u_getIntPropertyValue(c, UCHAR_GENERAL_CATEGORY) == U_NON_SPACING_MARK) return 0x; // Skip this character -} + return c; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source i18npool/inc i18npool/Library_i18npool.mk i18npool/source i18npool/util include/svx include/unotools offapi/com officecfg/registry svl/source svx/source svx/
cui/source/options/optgdlg.cxx |3 i18npool/Library_i18npool.mk |1 i18npool/inc/transliteration_Ignore.hxx|5 + i18npool/source/localedata/data/ar_DZ.xml |2 i18npool/source/localedata/data/ar_EG.xml | 10 ++ i18npool/source/localedata/data/ar_LB.xml |2 i18npool/source/localedata/data/ar_OM.xml |6 - i18npool/source/localedata/data/ar_SA.xml |2 i18npool/source/localedata/data/ar_TN.xml |2 i18npool/source/registerservices/registerservices.cxx |2 i18npool/source/transliteration/ignoreDiacritics_CTL.cxx | 45 ++ i18npool/source/transliteration/transliterationImpl.cxx|7 + i18npool/util/i18npool.component |3 include/svx/srchdlg.hxx|2 include/unotools/searchopt.hxx |2 offapi/com/sun/star/i18n/TransliterationModulesExtra.idl |3 officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 ++ officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs |6 + svl/source/items/srchitem.cxx |6 + svx/source/dialog/srchdlg.cxx | 30 +- svx/uiconfig/ui/findreplacedialog.ui | 17 +++ unotools/source/config/searchopt.cxx | 19 +++- 22 files changed, 162 insertions(+), 22 deletions(-) New commits: commit 448fa131b2dafac305d88480e469cc4bc0515d68 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Fri Jun 21 11:07:34 2013 +0200 Fix fdo#52204 add new feature ignore diacritics in search for CTL Change-Id: Ie9044a35003217545bacea214ef59047bff3b8b1 diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 12a46f0..729ed7c 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -65,6 +65,7 @@ #include dialmgr.hxx #include svtools/helpopt.hxx #include unotools/saveopt.hxx +#include unotools/searchopt.hxx #include sal/macros.h #include com/sun/star/configuration/theDefaultProvider.hpp @@ -1396,6 +1397,8 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet rSet ) if ( m_pCTLSupportCB-GetSavedValue() != m_pCTLSupportCB-IsChecked() ) { +SvtSearchOptions aOpt; +aOpt.SetIgnoreDiacritics_CTL (true); pLangConfig-aLanguageOptions.SetCTLFontEnabled( m_pCTLSupportCB-IsChecked() ); const sal_uInt16 STATE_COUNT = 1; diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index b578664..158f93f 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -93,6 +93,7 @@ $(eval $(call gb_Library_add_exception_objects,i18npool,\ i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP \ i18npool/source/transliteration/ignoreWidth \ i18npool/source/transliteration/ignoreZiZu_ja_JP \ + i18npool/source/transliteration/ignoreDiacritics_CTL \ i18npool/source/transliteration/katakanaToHiragana \ i18npool/source/transliteration/largeToSmall_ja_JP \ i18npool/source/transliteration/numtochar \ diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx index 26f9252..e66e16a 100644 --- a/i18npool/inc/transliteration_Ignore.hxx +++ b/i18npool/inc/transliteration_Ignore.hxx @@ -113,6 +113,11 @@ TRANSLITERATION_IGNORE(TraditionalKanji_ja_JP) #if defined( TRANSLITERATION_ZiZu_ja_JP ) || defined( TRANSLITERATION_ALL ) TRANSLITERATION_IGNORE(ZiZu_ja_JP) #endif + +#if defined( TRANSLITERATION_Diacritics_CTL ) || defined( TRANSLITERATION_ALL ) +TRANSLITERATION_IGNORE(Diacritics_CTL) +#endif + #undef TRANSLITERATION_IGNORE #define TRANSLITERATION_IGNORE( name ) \ diff --git a/i18npool/source/localedata/data/ar_DZ.xml b/i18npool/source/localedata/data/ar_DZ.xml index c3c3be7..bb63392 100644 --- a/i18npool/source/localedata/data/ar_DZ.xml +++ b/i18npool/source/localedata/data/ar_DZ.xml @@ -453,7 +453,7 @@ DecimalPlaces2/DecimalPlaces /Currency /LC_CURRENCY - LC_TRANSLITERATION ref=en_US/ + LC_TRANSLITERATION ref=ar_EG/ LC_MISC ref=ar_EG/ LC_NumberingLevel ref=ar_EG/ LC_OutLineNumberingLevel ref=ar_EG/ diff --git a/i18npool/source/localedata/data/ar_EG.xml b/i18npool/source/localedata/data/ar_EG.xml index defa49e..662a913 100644 --- a/i18npool/source/localedata/data/ar_EG.xml +++ b/i18npool/source/localedata/data/ar_EG.xml @@ -458,7 +458,15 @@ DecimalPlaces2/DecimalPlaces /Currency /LC_CURRENCY - LC_TRANSLITERATION ref=en_US/ + LC_TRANSLITERATION +Transliteration unoid=SENTENCE_CASE/ +Transliteration unoid=LOWERCASE_UPPERCASE/ +Transliteration unoid
[Libreoffice-commits] core.git: filter/inc filter/source filter/uiconfig filter/UIConfig_xsltdlg.mk
filter/UIConfig_xsltdlg.mk |1 filter/inc/filter.hrc |1 filter/source/pdf/impdialog.cxx| 96 +++ filter/source/pdf/impdialog.hrc| 20 - filter/source/pdf/impdialog.hxx| 27 -- filter/source/pdf/impdialog.src| 135 -- filter/uiconfig/ui/pdfuserinterfacepage.ui | 384 + 7 files changed, 440 insertions(+), 224 deletions(-) New commits: commit dbf1360e9fd4ac4a346e918344ef40213fb28914 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Fri Jun 21 15:52:40 2013 +0200 Convert to .ui pdf userinterface tab page Change-Id: I9203a63b2d6d1ab14ebee17611a78221755af082 diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk index 2b2c25f..f3f309c 100644 --- a/filter/UIConfig_xsltdlg.mk +++ b/filter/UIConfig_xsltdlg.mk @@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,filter)) $(eval $(call gb_UIConfig_add_uifiles,filter,\ filter/uiconfig/ui/pdflinkspage \ + filter/uiconfig/ui/pdfuserinterfacepage \ filter/uiconfig/ui/testxmlfilter \ filter/uiconfig/ui/xmlfiltersettings \ )) diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc index 138d661..91c936a 100644 --- a/filter/inc/filter.hrc +++ b/filter/inc/filter.hrc @@ -33,7 +33,6 @@ #define HID_FILTER_PDF_OPTIONS HID_FILTER_PDF_OPTIONS #define HID_FILTER_PDF_INITIAL_VIEW HID_FILTER_PDF_INITIAL_VIEW -#define HID_FILTER_PDF_USER_INTERFACE HID_FILTER_PDF_USER_INTERFACE #define HID_FILTER_PDF_SECURITY HID_FILTER_PDF_SECURITY #define HID_FILTER_PDF_SIGNINGHID_FILTER_PDF_SIGNING diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index ece4ccb..21e98af 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1023,33 +1023,25 @@ IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, void*, ) // - ImpPDFTabViewerPage::ImpPDFTabViewerPage( Window* pParent, const SfxItemSet rCoreSet ) : -SfxTabPage( pParent, PDFFilterResId( RID_PDF_TAB_VPREFER ), rCoreSet ), - -maFlWindowOptions( this, PDFFilterResId( FL_WINOPT ) ), -maCbResWinInit( this, PDFFilterResId( CB_WNDOPT_RESINIT ) ), -maCbCenterWindow( this, PDFFilterResId( CB_WNDOPT_CNTRWIN ) ), -maCbOpenFullScreen( this, PDFFilterResId( CB_WNDOPT_OPNFULL ) ), -maCbDispDocTitle( this, PDFFilterResId( CB_DISPDOCTITLE ) ), - -m_aVerticalLine(this, PDFFilterResId(FL_VPREFER_VERTICAL)), - -maFlUIOptions( this, PDFFilterResId( FL_USRIFOPT ) ), -maCbHideViewerMenubar( this, PDFFilterResId( CB_UOP_HIDEVMENUBAR ) ), -maCbHideViewerToolbar( this, PDFFilterResId( CB_UOP_HIDEVTOOLBAR ) ), -maCbHideViewerWindowControls( this, PDFFilterResId( CB_UOP_HIDEVWINCTRL ) ), -maFlTransitions( this, PDFFilterResId( FL_TRANSITIONS ) ), -maCbTransitionEffects( this, PDFFilterResId( CB_TRANSITIONEFFECTS ) ), -mbIsPresentation( sal_True ), -maFlBookmarks( this, PDFFilterResId( FL_BOOKMARKS ) ), -maRbAllBookmarkLevels( this, PDFFilterResId( RB_ALLBOOKMARKLEVELS ) ), -maRbVisibleBookmarkLevels( this, PDFFilterResId( RB_VISIBLEBOOKMARKLEVELS ) ), -maNumBookmarkLevels( this, PDFFilterResId( NUM_BOOKMARKLEVELS ) ) +SfxTabPage( pParent, PdfUserInterfacePage,filter/ui/pdfuserinterfacepage.ui, rCoreSet ) + { -FreeResource(); -maRbAllBookmarkLevels.SetToggleHdl( LINK( this, ImpPDFTabViewerPage, ToggleRbBookmarksHdl ) ); -maRbVisibleBookmarkLevels.SetToggleHdl( LINK( this, ImpPDFTabViewerPage, ToggleRbBookmarksHdl ) ); -maNumBookmarkLevels.SetAccessibleName(maRbVisibleBookmarkLevels.GetText()); - maNumBookmarkLevels.SetAccessibleRelationLabeledBy(maRbVisibleBookmarkLevels); +get(m_pCbResWinInit,resize); +get(m_pCbCenterWindow,center); +get(m_pCbOpenFullScreen,open); +get(m_pCbDispDocTitle,display); +get(m_pCbHideViewerMenubar,menubar); +get(m_pCbHideViewerToolbar,toolbar); +get(m_pCbHideViewerWindowControls,window); +get(m_pCbTransitionEffects,effects); +get(m_pRbAllBookmarkLevels,allbookmarks); +get(m_pRbVisibleBookmarkLevels,visiblebookmark); +get(m_pNumBookmarkLevels,visiblelevel); + +m_pRbAllBookmarkLevels-SetToggleHdl( LINK( this, ImpPDFTabViewerPage, ToggleRbBookmarksHdl ) ); +m_pRbVisibleBookmarkLevels-SetToggleHdl( LINK( this, ImpPDFTabViewerPage, ToggleRbBookmarksHdl ) ); + m_pNumBookmarkLevels-SetAccessibleName(m_pRbVisibleBookmarkLevels-GetText()); + m_pNumBookmarkLevels-SetAccessibleRelationLabeledBy(m_pRbVisibleBookmarkLevels); } // - @@ -1060,7 +1052,7 @@ ImpPDFTabViewerPage::~ImpPDFTabViewerPage() // - IMPL_LINK
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 559d2575ba4a13f06b330a079035d5243fef980f Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Fri Jun 21 16:30:29 2013 +0200 Updated core Project: help 50f4d76f4c5cc0ff36a5d761dbf78257c3d31d50 diff --git a/helpcontent2 b/helpcontent2 index fd638f9..50f4d76 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fd638f9abaea98e5a5f788b24faedc45fe01ec1e +Subproject commit 50f4d76f4c5cc0ff36a5d761dbf78257c3d31d50 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 12 source/text/shared/01/ref_pdf_export.xhp | 22 +++--- 2 files changed, 11 insertions(+), 23 deletions(-) New commits: commit 50f4d76f4c5cc0ff36a5d761dbf78257c3d31d50 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Fri Jun 21 16:30:29 2013 +0200 Update help ids for pdf userinterface tab page ui Change-Id: I568b7a75c194e8849f2815d69edb3fcacf46e938 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 01f0637..3795343 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1742,7 +1742,6 @@ HID_FILTER_NAVIGATOR_WIN,38073, HID_FILTER_PDF_INITIAL_VIEW,64150, HID_FILTER_PDF_OPTIONS,64149, HID_FILTER_PDF_SECURITY,64152, -HID_FILTER_PDF_USER_INTERFACE,64151, HID_FIRSTSTART_CANCEL,42781, HID_FIRSTSTART_FINISH,42782, HID_FIRSTSTART_NEXT,42780, @@ -6265,14 +6264,6 @@ filter_CheckBox_RID_PDF_TAB_GENER_CB_TAGGEDPDF,867845137, filter_CheckBox_RID_PDF_TAB_OPNFTR_CB_PGLY_FIRSTLEFT,867877986, filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENAB_ACCESS,867894416, filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENDAB_COPY,867894415, -filter_CheckBox_RID_PDF_TAB_VPREFER_CB_DISPDOCTITLE,867861608, -filter_CheckBox_RID_PDF_TAB_VPREFER_CB_TRANSITIONEFFECTS,867861614, -filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVMENUBAR,867861610, -filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVTOOLBAR,867861611, -filter_CheckBox_RID_PDF_TAB_VPREFER_CB_UOP_HIDEVWINCTRL,867861612, -filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_CNTRWIN,867861606, -filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_OPNFULL,867861607, -filter_CheckBox_RID_PDF_TAB_VPREFER_CB_WNDOPT_RESINIT,867861605, filter_ComboBox_RID_PDF_TAB_GENER_CO_REDUCEIMAGERESOLUTION,867848207, filter_Edit_RID_PDF_TAB_GENER_ED_PAGES,867846149, filter_ListBox_RID_PDF_TAB_GENER_LB_FORMSFORMAT,867847702, @@ -6282,7 +6273,6 @@ filter_ModalDialog_DLG_OPTIONS,1090519040, filter_ModalDialog_RID_PDF_ERROR_DLG,1404878848, filter_NumericField_DLG_OPTIONS_NUM_FLD_QUALITY,1090525185, filter_NumericField_RID_PDF_TAB_OPNFTR_NUM_MAGNF_INITIAL_PAGE,867883100, -filter_NumericField_RID_PDF_TAB_VPREFER_NUM_BOOKMARKLEVELS,867866738, filter_PushButton_RID_PDF_TAB_SECURITY_BTN_OWNER_PWD,867897983, filter_PushButton_RID_PDF_TAB_SECURITY_BTN_USER_PWD,867897976, filter_RadioButton_RID_PDF_TAB_GENER_RB_ALL,867844610, @@ -6310,8 +6300,6 @@ filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_NONE,867893898, filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_HIGHRES,867893896, filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_LOWRES,867893895, filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_NONE,867893894, -filter_RadioButton_RID_PDF_TAB_VPREFER_RB_ALLBOOKMARKLEVELS,867861104, -filter_RadioButton_RID_PDF_TAB_VPREFER_RB_VISIBLEBOOKMARKLEVELS,867861105, formula_CheckBox_RID_FORMULADLG_FORMULA_BTN_MATRIX,2655437835, formula_CheckBox_RID_FORMULADLG_FORMULA_MODAL_BTN_MATRIX,1581728779, formula_Edit_RID_FORMULADLG_FORMULA_ED_REF,2655438867, diff --git a/source/text/shared/01/ref_pdf_export.xhp b/source/text/shared/01/ref_pdf_export.xhp index f5360c8..72c3028 100644 --- a/source/text/shared/01/ref_pdf_export.xhp +++ b/source/text/shared/01/ref_pdf_export.xhp @@ -173,40 +173,40 @@ paragraph xml-lang=en-US id=par_id9596850 role=paragraph l10n=NEWahelp hid=.Select to generate a PDF file that shows pages side by side in a continuous column. For more than two pages, the first page is displayed on the left. You must enable support for complex text layout on Language settings - Languages in the Options dialog box./ahelp/paragraph paragraph xml-lang=en-US id=hd_id18005 role=heading level=1 l10n=NEWUser Interface tab/paragraph paragraph xml-lang=en-US id=hd_id6676839 role=heading level=2 l10n=NEWWindow options/paragraph -bookmark xml-lang=en-US branch=hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_RESINIT id=bm_id4184392 localize=false/ +bookmark xml-lang=en-US branch=hid/filter/ui/pdfuserinterfacepage/resize id=bm_id4184392 localize=false/ paragraph xml-lang=en-US id=hd_id3809015 role=heading level=3 l10n=NEWResize window to initial page/paragraph paragraph xml-lang=en-US id=par_id1321146 role=paragraph l10n=CHGahelp hid=.Select to generate a PDF file that is shown in a window displaying the whole initial page./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_CNTRWIN id=bm_id1589098 localize=false/ +bookmark xml-lang=en-US branch=hid/filter/ui/pdfuserinterfacepage/center id=bm_id1589098 localize=false/ paragraph xml-lang=en-US id=hd_id6994842 role=heading level=3 l10n=NEWCenter window on screen/paragraph paragraph xml-lang=en-US id=par_id9601428 role=paragraph l10n=NEWahelp hid=.Select to generate a PDF file that is shown in a reader window centered on screen./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_OPNFULL id=bm_id1278420 localize=false
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/core/xmlfilterbase.cxx |2 +- oox/source/docprop/docprophandler.cxx |4 ++-- sw/qa/extras/ooxmlexport/data/fdo63053.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 11 ++- 4 files changed, 13 insertions(+), 4 deletions(-) New commits: commit 36de708ce421b31beaaddb1048d444de91b2e5e9 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Sat Jun 15 12:43:29 2013 +0200 fix fdo#63053 ampersand in document title causes corrupt docx FILESAVE, FILEOPEN: ampersand in document title causes corrupt docx when saving; truncates title when loading diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index 9a06b81..8a59187 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -450,7 +450,7 @@ writeElement( FSHelperPtr pDoc, sal_Int32 nXmlElement, const OUString sValue ) if( sValue.isEmpty() ) return; pDoc-startElement( nXmlElement, FSEND ); -pDoc-write( sValue ); +pDoc-writeEscaped( sValue ); pDoc-endElement( nXmlElement ); } diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 08cfda0..50d5d4c 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -453,11 +453,11 @@ void SAL_CALL OOXMLDocPropHandler::characters( const OUString aChars ) break; case DC_TOKEN( subject ): -m_xDocProp-setSubject( aChars ); +m_xDocProp-setSubject( m_xDocProp-getSubject() + aChars ); break; case DC_TOKEN( title ): -m_xDocProp-setTitle( aChars ); +m_xDocProp-setTitle( m_xDocProp-getTitle() + aChars ); break; default: diff --git a/sw/qa/extras/ooxmlexport/data/fdo63053.docx b/sw/qa/extras/ooxmlexport/data/fdo63053.docx new file mode 100644 index 000..43282b0 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo63053.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 494076c..b832322 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -75,7 +75,7 @@ public: void testPageGraphicBackground(); void testFdo65265(); void testFdo65655(); - +void testFDO63053(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) CPPUNIT_TEST(run); @@ -127,6 +127,8 @@ void Test::run() {page-graphic-background.odt, Test::testPageGraphicBackground}, {fdo65265.docx, Test::testFdo65265}, {fdo65655.docx, Test::testFdo65655}, +{fdo63053.docx , Test::testFDO63053}, + }; // Don't test the first import of these, for some reason those tests fail const char* aBlacklist[] = { @@ -725,6 +727,13 @@ void Test::testFdo65655() CPPUNIT_ASSERT_EQUAL(false, bool(bValue)); xPropertySet-getPropertyValue(FooterIsShared) = bValue; CPPUNIT_ASSERT_EQUAL(false, bool(bValue)); + +void Test::testFDO63053() +{ +uno::Referencedocument::XDocumentPropertiesSupplier xDocumentPropertiesSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencedocument::XDocumentProperties xDocumentProperties = xDocumentPropertiesSupplier-getDocumentProperties(); +CPPUNIT_ASSERT_EQUAL(OUString(test1test2), xDocumentProperties-getTitle()); +CPPUNIT_ASSERT_EQUAL(OUString(test1test2), xDocumentProperties-getSubject()); } CPPUNIT_TEST_SUITE_REGISTRATION(Test); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ABANDONED] fdo#64947:set digit language, before OutputDevice draw text.
abdulmajeed ahmed has abandoned this change. Change subject: fdo#64947:set digit language, before OutputDevice draw text. .. Patch Set 5: Abandoned it's not the optimal solution there is a another way to do it -- To view, visit https://gerrit.libreoffice.org/3773 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ie54193d938e0b6ab6bccb6decb9f245037aebb4b Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: navin patidar pati...@kacst.edu.sa Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Gerrit-Reviewer: navin patidar pati...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/attarray.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 296834c2da5c5a9e733b209d68cdb831441e8a64 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Mon May 27 23:50:52 2013 +0200 prevent increase indent from running outside the cell i have used ColWidth- SC_INDENT_STEP value to keep at lesat one letter inside the cell Change-Id: I08e121623ed1a55f6002a6a38586ab3d4fb8b850 Change-Id: I8d4518845f64044dea2f4ecd393cc625eebc6302 Reviewed-on: https://gerrit.libreoffice.org/4030 Reviewed-by: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Tested-by: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 0744247..631874b 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -1657,12 +1657,14 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement ((const SvxHorJustifyItem*)pItem)-GetValue() != SVX_HOR_JUSTIFY_RIGHT )); sal_uInt16 nOldValue = ((const SfxUInt16Item)rOldSet.Get( ATTR_INDENT )).GetValue(); sal_uInt16 nNewValue = nOldValue; +//to keep Increment indent from running outside the cell1659 +long nColWidth = (long)pDocument-GetColWidth(nCol,nTab); if ( bIncrement ) { -if ( nNewValue SC_MAX_INDENT ) +if ( nNewValue nColWidth-SC_INDENT_STEP ) { nNewValue += SC_INDENT_STEP; -if ( nNewValue SC_MAX_INDENT ) nNewValue = SC_MAX_INDENT; +if ( nNewValue nColWidth-SC_INDENT_STEP ) nNewValue = nColWidth-SC_INDENT_STEP; } } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] prevent increase indent from running outside the cell
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4030 Approvals: abdulmajeed ahmed: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4030 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d4518845f64044dea2f4ecd393cc625eebc6302 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/inc filter/source filter/uiconfig filter/UIConfig_xsltdlg.mk
filter/UIConfig_xsltdlg.mk |1 filter/inc/filter.hrc |1 filter/source/pdf/impdialog.cxx| 125 ++-- filter/source/pdf/impdialog.hrc| 11 -- filter/source/pdf/impdialog.hxx| 13 +- filter/source/pdf/impdialog.src| 74 -- filter/uiconfig/ui/pdflinkspage.ui | 192 + 7 files changed, 235 insertions(+), 182 deletions(-) New commits: commit c5debaa9c46c879f1deee088d12bf2c951296706 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Sat Jun 8 11:49:29 2013 +0200 convert pdf links tab page to .ui Change-Id: I305021366a2670a582f00433be2a6e26d745f587 diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk index 0a9294d..2b2c25f 100644 --- a/filter/UIConfig_xsltdlg.mk +++ b/filter/UIConfig_xsltdlg.mk @@ -10,6 +10,7 @@ $(eval $(call gb_UIConfig_UIConfig,filter)) $(eval $(call gb_UIConfig_add_uifiles,filter,\ + filter/uiconfig/ui/pdflinkspage \ filter/uiconfig/ui/testxmlfilter \ filter/uiconfig/ui/xmlfiltersettings \ )) diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc index 7e372af..138d661 100644 --- a/filter/inc/filter.hrc +++ b/filter/inc/filter.hrc @@ -35,7 +35,6 @@ #define HID_FILTER_PDF_INITIAL_VIEW HID_FILTER_PDF_INITIAL_VIEW #define HID_FILTER_PDF_USER_INTERFACE HID_FILTER_PDF_USER_INTERFACE #define HID_FILTER_PDF_SECURITY HID_FILTER_PDF_SECURITY -#define HID_FILTER_PDF_LINKS HID_FILTER_PDF_LINKS #define HID_FILTER_PDF_SIGNINGHID_FILTER_PDF_SIGNING #endif diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 77d56e8..ece4ccb 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1374,71 +1374,18 @@ voidImpPDFTabSecurityPage::ImplPDFASecurityControl( sal_Bool bEnableSecurity // - ImpPDFTabLinksPage::ImpPDFTabLinksPage( Window* pParent, const SfxItemSet rCoreSet ) : -SfxTabPage( pParent, PDFFilterResId( RID_PDF_TAB_LINKS ), rCoreSet ), +SfxTabPage( pParent, PdfLinksPage,filter/ui/pdflinkspage.ui,rCoreSet ), -maCbExprtBmkrToNmDst( this, PDFFilterResId( CB_EXP_BMRK_TO_DEST ) ), -maCbOOoToPDFTargets( this, PDFFilterResId( CB_CNV_OOO_DOCTOPDF ) ), - maCbExportRelativeFsysLinks( this, PDFFilterResId( CB_ENAB_RELLINKFSYS ) ), - -maFlDefaultTitle( this, PDFFilterResId( FL_DEFAULT_LINK_ACTION ) ), -maRbOpnLnksDefault( this, PDFFilterResId( CB_VIEW_PDF_DEFAULT ) ), mbOpnLnksDefaultUserState( sal_False ), -maRbOpnLnksLaunch( this, PDFFilterResId( CB_VIEW_PDF_APPLICATION ) ), mbOpnLnksLaunchUserState( sal_False ), -maRbOpnLnksBrowser( this, PDFFilterResId( CB_VIEW_PDF_BROWSER ) ), mbOpnLnksBrowserUserState( sal_False ) { -FreeResource(); - -// pb: #i91991# checkboxes only double-spaced if necessary -long nDelta = 0; -Size aSize = maCbExprtBmkrToNmDst.GetSizePixel(); -Size aMinSize = maCbExprtBmkrToNmDst.CalcMinimumSize(); -long nLineHeight = -maCbExprtBmkrToNmDst.LogicToPixel( Size( 10, 10 ), MAP_APPFONT ).Height(); -if ( aSize.Width() aMinSize.Width() ) -{ -Size aNewSize( aSize.Width(), nLineHeight ); -nDelta += ( aSize.Height() - nLineHeight ); -maCbExprtBmkrToNmDst.SetSizePixel( aNewSize ); -Point aNewPos = maCbOOoToPDFTargets.GetPosPixel(); -aNewPos.Y() -= nDelta; -maCbOOoToPDFTargets.SetPosPixel( aNewPos ); -} - -aSize = maCbOOoToPDFTargets.GetSizePixel(); -aMinSize = maCbOOoToPDFTargets.CalcMinimumSize(); -if ( aSize.Width() aMinSize.Width() ) -{ -Size aNewSize( aSize.Width(), nLineHeight ); -nDelta += ( aSize.Height() - nLineHeight ); -maCbOOoToPDFTargets.SetSizePixel( aNewSize ); -Point aNewPos = maCbExportRelativeFsysLinks.GetPosPixel(); -aNewPos.Y() -= nDelta; -maCbExportRelativeFsysLinks.SetPosPixel( aNewPos ); -} - -aSize = maCbExportRelativeFsysLinks.GetSizePixel(); -aMinSize = maCbExportRelativeFsysLinks.CalcMinimumSize(); -if ( aSize.Width() aMinSize.Width() ) -{ -Size aNewSize( aSize.Width(), nLineHeight ); -nDelta += ( aSize.Height() - nLineHeight ); -maCbExportRelativeFsysLinks.SetSizePixel( aNewSize ); -} - -if ( nDelta 0 ) -{ -Window* pWins[] = -{ maFlDefaultTitle, maRbOpnLnksDefault, maRbOpnLnksLaunch, maRbOpnLnksBrowser, NULL }; -Window** pCurrent = pWins; -while ( *pCurrent ) -{ -Point aNewPos = (*pCurrent)-GetPosPixel(); -aNewPos.Y() -= nDelta; -(*pCurrent++)-SetPosPixel( aNewPos ); -} -} +get(m_pCbExprtBmkrToNmDst,export); +get(m_pCbOOoToPDFTargets ,convert); +get(m_pCbExportRelativeFsysLinks ,exporturl
[Libreoffice-commits] core.git: sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/AllLangResTarget_sc.mk |1 sc/UIConfig_scalc.mk |1 sc/inc/helpids.h |1 sc/inc/sc.hrc |1 sc/source/ui/inc/opredlin.hrc | 32 -- sc/source/ui/inc/opredlin.hxx | 13 -- sc/source/ui/optdlg/opredlin.cxx | 91 - sc/source/ui/src/opredlin.src | 97 -- sc/source/ui/src/scstring.src |5 sc/uiconfig/scalc/ui/optchangespage.ui | 170 + 10 files changed, 223 insertions(+), 189 deletions(-) New commits: commit de72699615bd2d12257d1a295e541ed5117fe28c Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Thu Jun 6 11:57:54 2013 +0200 Convert Changes tab page to .ui Change-Id: I9d1ff420730ec9ec17e1b33f6b7180b9b89a33c4 diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 1230786..acf0911 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -54,7 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/src/tabopdlg.src \ sc/source/ui/src/scstring.src \ sc/source/ui/src/dbnamdlg.src \ -sc/source/ui/src/opredlin.src \ sc/source/ui/src/sortdlg.src \ sc/source/ui/src/filter.src \ sc/source/ui/src/colorformat.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index f29ba07..a9b2e6a 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/leftheaderdialog \ sc/uiconfig/scalc/ui/managenamesdialog \ sc/uiconfig/scalc/ui/optcalculatepage \ + sc/uiconfig/scalc/ui/optchangespage \ sc/uiconfig/scalc/ui/optdefaultpage \ sc/uiconfig/scalc/ui/printeroptions \ sc/uiconfig/scalc/ui/protectsheetdlg \ diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 9744a35..2037945 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -109,7 +109,6 @@ #define HID_COLROWNAMERANGES SC_HID_COLROWNAMERANGES #define HID_FUNCTION_BOX SC_HID_FUNCTION_BOX -#define HID_SCPAGE_OPREDLINE SC_HID_SCPAGE_OPREDLINE #define HID_SC_REDLIN_CTR SC_HID_SC_REDLIN_CTR // Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) --- diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 6fbe3f0..7b823b0 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -829,6 +829,7 @@ #define SCSTR_ORIENTATION_TOPBOTTOM (STR_START + 110) #define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111) #define SCSTR_ORIENTATION_STANDARD (STR_START + 112) +#define SCSTR_AUTHOR(STR_START + 113) // accessibility diff --git a/sc/source/ui/inc/opredlin.hrc b/sc/source/ui/inc/opredlin.hrc deleted file mode 100644 index 3b5b92c..000 --- a/sc/source/ui/inc/opredlin.hrc +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include sc.hrc // - RID_SCPAGE_OPREDLINE - -#define FT_CONTENT 1 -#define FT_REMOVE 2 -#define FT_INSERT 3 -#define FT_MOVE 4 -#define GB_COLORCHGS1 -#define CLB_CONTENT 1 -#define CLB_REMOVE 2 -#define CLB_INSERT 3 -#define CLB_MOVE4 -#define STR_AUTHOR 1 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index c461352..6236b01 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -36,15 +36,10 @@ class ScRedlineOptionsTabPage : public SfxTabPage { -FixedText aContentFT; -ColorListBoxaContentColorLB; -FixedText aRemoveFT; -ColorListBoxaRemoveColorLB; -FixedText aInsertFT; -ColorListBoxaInsertColorLB; -FixedText aMoveFT; -ColorListBoxaMoveColorLB; -FixedLine aChangedGB; +ColorListBox* m_pContentColorLB; +ColorListBox
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1 sc/inc/helpids.h |1 sc/source/ui/inc/optdlg.hrc |4 - sc/source/ui/inc/tpcompatibility.hxx |4 - sc/source/ui/optdlg/tpcompatibility.cxx | 17 ++--- sc/source/ui/src/optdlg.src | 38 --- sc/uiconfig/scalc/ui/optcompatibilitypage.ui | 90 +++ 7 files changed, 99 insertions(+), 56 deletions(-) New commits: commit dc676d9d7a2aa92758e97208d4c6e641d2798664 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Thu Jun 6 13:01:34 2013 +0200 Convert Compatibility tab page to .ui Change-Id: I97e5ecfb800443e41b2d9a88731cc530600a7b1c diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index a9b2e6a..8fc9e35 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -81,6 +81,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/managenamesdialog \ sc/uiconfig/scalc/ui/optcalculatepage \ sc/uiconfig/scalc/ui/optchangespage \ + sc/uiconfig/scalc/ui/optcompatibilitypage \ sc/uiconfig/scalc/ui/optdefaultpage \ sc/uiconfig/scalc/ui/printeroptions \ sc/uiconfig/scalc/ui/protectsheetdlg \ diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 2037945..afef8bb 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -63,7 +63,6 @@ #define HID_SCPAGE_FORMULA SC_HID_SCPAGE_FORMULA #define HID_SCPAGE_USERLISTS SC_HID_SCPAGE_USERLISTS #define HID_SCPAGE_AREAS SC_HID_SCPAGE_AREAS -#define HID_SCPAGE_COMPATIBILITY SC_HID_SCPAGE_COMPATIBILITY #define HID_SCPAGE_SUBT_GROUP1 SC_HID_SCPAGE_SUBT_GROUP1 #define HID_SCPAGE_SUBT_GROUP2 SC_HID_SCPAGE_SUBT_GROUP2 #define HID_SCPAGE_SUBT_GROUP3 SC_HID_SCPAGE_SUBT_GROUP3 diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc index 78fdf85..4103d54 100644 --- a/sc/source/ui/inc/optdlg.hrc +++ b/sc/source/ui/inc/optdlg.hrc @@ -147,9 +147,5 @@ #define FT_ODF_RECALC 99 #define LB_ODF_RECALC100 -// TP_COMPATIBILITY -#define FL_KEY_BINDINGS 1 -#define FT_KEY_BINDINGS 2 -#define LB_KEY_BINDINGS 3 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 67b906c..01d74f4 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -30,9 +30,7 @@ private: virtual ~ScTpCompatOptions(); private: -FixedLine maFlKeyBindings; -FixedText maFtKeyBindings; -ListBox maLbKeyBindings; +ListBox* m_pLbKeyBindings; }; #endif diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 00f9ef4..3aa1b60 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -16,12 +16,9 @@ #include appoptio.hxx ScTpCompatOptions::ScTpCompatOptions(Window *pParent, const SfxItemSet rCoreAttrs) : -SfxTabPage(pParent, ScResId(RID_SCPAGE_COMPATIBILITY), rCoreAttrs), -maFlKeyBindings(this, ScResId(FL_KEY_BINDINGS)), -maFtKeyBindings(this, ScResId(FT_KEY_BINDINGS)), -maLbKeyBindings(this, ScResId(LB_KEY_BINDINGS)) +SfxTabPage(pParent, OptCompatibilityPage,modules/scalc/ui/optcompatibilitypage.ui, rCoreAttrs) { -FreeResource(); +get(m_pLbKeyBindings,keybindings); } ScTpCompatOptions::~ScTpCompatOptions() @@ -36,11 +33,11 @@ SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet rCoreAt sal_Bool ScTpCompatOptions::FillItemSet(SfxItemSet rCoreAttrs) { bool bRet = false; -if (maLbKeyBindings.GetSavedValue() != maLbKeyBindings.GetSelectEntryPos()) +if (m_pLbKeyBindings-GetSavedValue() != m_pLbKeyBindings-GetSelectEntryPos()) { rCoreAttrs.Put( SfxUInt16Item( -SID_SC_OPT_KEY_BINDING_COMPAT, maLbKeyBindings.GetSelectEntryPos())); +SID_SC_OPT_KEY_BINDING_COMPAT, m_pLbKeyBindings-GetSelectEntryPos())); bRet = true; } return bRet; @@ -58,17 +55,17 @@ void ScTpCompatOptions::Reset(const SfxItemSet rCoreAttrs) switch (eKeyB) { case ScOptionsUtil::KEY_DEFAULT: -maLbKeyBindings.SelectEntryPos(0); +m_pLbKeyBindings-SelectEntryPos(0); break; case ScOptionsUtil::KEY_OOO_LEGACY: -maLbKeyBindings.SelectEntryPos(1); +m_pLbKeyBindings-SelectEntryPos(1); break; default: ; } } -maLbKeyBindings.SaveValue(); +m_pLbKeyBindings-SaveValue(); } int ScTpCompatOptions::DeactivatePage
[Libreoffice-commits] core.git: svtools/source
svtools/source/hatchwindow/ipwin.cxx | 62 +-- 1 file changed, 53 insertions(+), 9 deletions(-) New commits: commit b83edcf00d4ccd0c734731ed66d167286bf89d6b Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Wed Jun 5 14:35:30 2013 +0200 fdo#56412 Movement of embedded objects is opposite to the change direction not a perfect solution but best we can get without large rework. Change-Id: I4a8c6eb611dd88cb2b10b80a914c66a11c1c diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index 022489b..6b67502 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -210,31 +210,50 @@ Point SvResizeHelper::GetTrackPosPixel( const Rectangle rRect ) const Point aBR = aOuter.BottomRight(); Point aTR = aOuter.TopRight(); Point aBL = aOuter.BottomLeft(); +bool bRTL = Application::GetSettings().GetLayoutRTL(); switch( nGrab ) { case 0: +// FIXME: disable it for RTL because it's wrong calculations +if( bRTL ) +break; aPos = aRect.TopLeft() - aOuter.TopLeft(); break; case 1: aPos.Y() = aRect.Top() - aOuter.Top(); break; case 2: +// FIXME: disable it for RTL because it's wrong calculations +if( bRTL ) +break; aPos = aRect.TopRight() - aTR; break; case 3: -aPos.X() = aRect.Right() - aTR.X(); +if( bRTL ) +aPos.X() = aRect.Left() - aTR.X(); +else +aPos.X() = aRect.Right() - aTR.X(); break; case 4: +// FIXME: disable it for RTL because it's wrong calculations +if( bRTL ) +break; aPos = aRect.BottomRight() - aBR; break; case 5: aPos.Y() = aRect.Bottom() - aBR.Y(); break; case 6: +// FIXME: disable it for RTL because it's wrong calculations +if( bRTL ) +break; aPos = aRect.BottomLeft() - aBL; break; case 7: -aPos.X() = aRect.Left() - aOuter.Left(); +if( bRTL ) +aPos.X() = aRect.Right() + aOuter.Right() - aOuter.TopRight().X(); +else +aPos.X() = aRect.Left() - aOuter.Left(); break; case 8: aPos = aRect.TopLeft() - aOuter.TopLeft(); @@ -256,38 +275,63 @@ Rectangle SvResizeHelper::GetTrackRectPixel( const Point rTrackPos ) const Point aDiff = rTrackPos - aSelPos; aTrackRect = aOuter; Point aBR = aOuter.BottomRight(); +bool bRTL = Application::GetSettings().GetLayoutRTL(); switch( nGrab ) { case 0: aTrackRect.Top() += aDiff.Y(); -aTrackRect.Left() += aDiff.X(); +// ugly solution for resizing OLE objects in RTL +if( bRTL ) +aTrackRect.Right() = aBR.X() - aDiff.X(); +else +aTrackRect.Left() += aDiff.X(); break; case 1: aTrackRect.Top() += aDiff.Y(); break; case 2: aTrackRect.Top() += aDiff.Y(); -aTrackRect.Right() = aBR.X() + aDiff.X(); +// ugly solution for resizing OLE objects in RTL +if( bRTL ) +aTrackRect.Left() -= aDiff.X(); +else +aTrackRect.Right() = aBR.X() + aDiff.X(); break; case 3: -aTrackRect.Right() = aBR.X() + aDiff.X(); +// ugly solution for resizing OLE objects in RTL +if( bRTL ) +aTrackRect.Left() -= aDiff.X(); +else +aTrackRect.Right() = aBR.X() + aDiff.X(); break; case 4: aTrackRect.Bottom() = aBR.Y() + aDiff.Y(); -aTrackRect.Right() = aBR.X() + aDiff.X(); +// ugly solution for resizing OLE objects in RTL +if( bRTL ) +aTrackRect.Left() -= aDiff.X(); +else +aTrackRect.Right() = aBR.X() + aDiff.X(); break; case 5: aTrackRect.Bottom() = aBR.Y() + aDiff.Y(); break; case 6: aTrackRect.Bottom() = aBR.Y() + aDiff.Y(); -aTrackRect.Left() += aDiff.X(); +// ugly solution for resizing OLE objects in RTL +if( bRTL ) +aTrackRect.Right() = aBR.X() - aDiff.X(); +else +aTrackRect.Left() += aDiff.X(); break
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/data/attarray.cxx |3 ++- sc/source/ui/view/output2.cxx| 28 +--- 2 files changed, 19 insertions(+), 12 deletions(-) New commits: commit 4e673dbb5b7c7f0fd48d50255d10340229a33ade Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Fri May 31 10:26:13 2013 +0200 Code clean up Change-Id: I0e75478e4cb98409210ca40dcaa4676a69c30f6c diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 7bfcf4e..33432fa 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -140,19 +140,19 @@ public: void SetTextToWidthOrHash( ScRefCellValue rCell, long nWidth ); voidSetAutoText( const String rAutoText ); -const ScPatternAttr*GetPattern() const { return pPattern; } -SvxCellOrientation GetOrient() const { return eAttrOrient; } -SvxCellHorJustify GetHorJust() const { return eAttrHorJust; } -SvxCellVerJustify GetVerJust() const { return eAttrVerJust; } +const ScPatternAttr*GetPattern() const { return pPattern; } +SvxCellOrientation GetOrient() const{ return eAttrOrient; } +SvxCellHorJustify GetHorJust() const { return eAttrHorJust; } +SvxCellVerJustify GetVerJust() const { return eAttrVerJust; } SvxCellJustifyMethodGetHorJustMethod() const { return eAttrHorJustMethod; } SvxCellJustifyMethodGetVerJustMethod() const { return eAttrVerJustMethod; } -const SvxMarginItem*GetMargin() const { return pMargin; } +const SvxMarginItem*GetMargin() const{ return pMargin; } sal_uInt16 GetLeftTotal() const { return pMargin-GetLeftMargin() + nIndent; } sal_uInt16 GetRightTotal() const{ return pMargin-GetRightMargin() + nIndent; } -const String GetString() const { return aString; } -const Size GetTextSize() const { return aTextSize; } +const String GetString() const{ return aString; } +const Size GetTextSize() const { return aTextSize; } longGetOriginalWidth() const { return nOriginalWidth; } sal_uLong GetResultValueFormat( const ScRefCellValue rCell ) const; commit af169a601dee381b17d1e87c346f2d97bad9a69f Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Fri May 31 10:05:55 2013 +0200 Fix fdo#51835 Indent changes in Calc forces alignment to left Change-Id: Ifef68cdd62a11b5cdc032a91a7dd96fa0357a42c diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 7ef3103..0744247 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -1653,7 +1653,8 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement const SfxPoolItem* pItem; bool bNeedJust = ( rOldSet.GetItemState( ATTR_HOR_JUSTIFY, false, pItem ) != SFX_ITEM_SET -|| ((const SvxHorJustifyItem*)pItem)-GetValue() != SVX_HOR_JUSTIFY_LEFT ); + || (((const SvxHorJustifyItem*)pItem)-GetValue() != SVX_HOR_JUSTIFY_LEFT + ((const SvxHorJustifyItem*)pItem)-GetValue() != SVX_HOR_JUSTIFY_RIGHT )); sal_uInt16 nOldValue = ((const SfxUInt16Item)rOldSet.Get( ATTR_INDENT )).GetValue(); sal_uInt16 nNewValue = nOldValue; if ( bIncrement ) diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index ef75405..7bfcf4e 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -148,7 +148,8 @@ public: SvxCellJustifyMethodGetVerJustMethod() const { return eAttrVerJustMethod; } const SvxMarginItem*GetMargin() const { return pMargin; } -sal_uInt16 GetLeftTotal() const{ return pMargin-GetLeftMargin() + nIndent; } +sal_uInt16 GetLeftTotal() const { return pMargin-GetLeftMargin() + nIndent; } +sal_uInt16 GetRightTotal() const{ return pMargin-GetRightMargin() + nIndent; } const String GetString() const { return aString; } const Size GetTextSize() const { return aTextSize; } @@ -422,7 +423,7 @@ void ScDrawStringsVars::SetPattern( // Raender pMargin = (const SvxMarginItem*)pPattern-GetItem( ATTR_MARGIN, pCondSet ); -if ( eAttrHorJust == SVX_HOR_JUSTIFY_LEFT ) +if ( eAttrHorJust == SVX_HOR_JUSTIFY_LEFT || eAttrHorJust == SVX_HOR_JUSTIFY_RIGHT ) nIndent = ((const SfxUInt16Item)pPattern-GetItem( ATTR_INDENT, pCondSet )).GetValue(); else nIndent = 0; @@ -1863,7 +1864,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) break; case SVX_HOR_JUSTIFY_RIGHT: nJustPosX += nAvailWidth - aVars.GetTextSize
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/core/data/attarray.cxx |3 ++- sc/source/ui/view/output2.cxx| 14 ++ 2 files changed, 12 insertions(+), 5 deletions(-) New commits: commit a81f52a3367f54675c89c1fc84ca161598662bd8 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Fri May 31 10:05:55 2013 +0200 Fix fdo#51835 Indent changes in Calc forces alignment to left Change-Id: Ifef68cdd62a11b5cdc032a91a7dd96fa0357a42c (cherry picked from commit af169a601dee381b17d1e87c346f2d97bad9a69f) diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 7ef3103..0744247 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -1653,7 +1653,8 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement const SfxPoolItem* pItem; bool bNeedJust = ( rOldSet.GetItemState( ATTR_HOR_JUSTIFY, false, pItem ) != SFX_ITEM_SET -|| ((const SvxHorJustifyItem*)pItem)-GetValue() != SVX_HOR_JUSTIFY_LEFT ); + || (((const SvxHorJustifyItem*)pItem)-GetValue() != SVX_HOR_JUSTIFY_LEFT + ((const SvxHorJustifyItem*)pItem)-GetValue() != SVX_HOR_JUSTIFY_RIGHT )); sal_uInt16 nOldValue = ((const SfxUInt16Item)rOldSet.Get( ATTR_INDENT )).GetValue(); sal_uInt16 nNewValue = nOldValue; if ( bIncrement ) diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index ef75405..7bfcf4e 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -148,7 +148,8 @@ public: SvxCellJustifyMethodGetVerJustMethod() const { return eAttrVerJustMethod; } const SvxMarginItem*GetMargin() const { return pMargin; } -sal_uInt16 GetLeftTotal() const{ return pMargin-GetLeftMargin() + nIndent; } +sal_uInt16 GetLeftTotal() const { return pMargin-GetLeftMargin() + nIndent; } +sal_uInt16 GetRightTotal() const{ return pMargin-GetRightMargin() + nIndent; } const String GetString() const { return aString; } const Size GetTextSize() const { return aTextSize; } @@ -422,7 +423,7 @@ void ScDrawStringsVars::SetPattern( // Raender pMargin = (const SvxMarginItem*)pPattern-GetItem( ATTR_MARGIN, pCondSet ); -if ( eAttrHorJust == SVX_HOR_JUSTIFY_LEFT ) +if ( eAttrHorJust == SVX_HOR_JUSTIFY_LEFT || eAttrHorJust == SVX_HOR_JUSTIFY_RIGHT ) nIndent = ((const SfxUInt16Item)pPattern-GetItem( ATTR_INDENT, pCondSet )).GetValue(); else nIndent = 0; @@ -1863,7 +1864,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) break; case SVX_HOR_JUSTIFY_RIGHT: nJustPosX += nAvailWidth - aVars.GetTextSize().Width() - -(long) ( aVars.GetMargin()-GetRightMargin() * mnPPTX ); +(long) ( aVars.GetRightTotal() * mnPPTX ); bRightAdjusted = sal_True; break; case SVX_HOR_JUSTIFY_CENTER: @@ -2376,13 +2377,18 @@ void ScOutputData::DrawEditParam::calcMargins(long rTopM, long rLeftM, long r static_castconst SvxMarginItem(mpPattern-GetItem(ATTR_MARGIN, mpCondSet)); sal_uInt16 nIndent = 0; -if (meHorJust == SVX_HOR_JUSTIFY_LEFT) +if (meHorJust == SVX_HOR_JUSTIFY_LEFT || meHorJust == SVX_HOR_JUSTIFY_RIGHT) nIndent = lcl_GetValueSfxUInt16Item, sal_uInt16(*mpPattern, ATTR_INDENT, mpCondSet); rLeftM = static_castlong(((rMargin.GetLeftMargin() + nIndent) * nPPTX)); rTopM= static_castlong((rMargin.GetTopMargin() * nPPTY)); rRightM = static_castlong((rMargin.GetRightMargin() * nPPTX)); rBottomM = static_castlong((rMargin.GetBottomMargin() * nPPTY)); +if(meHorJust == SVX_HOR_JUSTIFY_RIGHT) +{ +rLeftM = static_castlong((rMargin.GetLeftMargin() * nPPTX)); +rRightM = static_castlong(((rMargin.GetRightMargin() + nIndent) * nPPTX)); +} } void ScOutputData::DrawEditParam::calcPaperSize( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |2 sw/UIConfig_swriter.mk |1 sw/inc/helpid.h |1 sw/source/ui/config/optdlg.hrc |9 - sw/source/ui/config/optdlg.src | 75 --- sw/source/ui/config/optpage.cxx | 110 - sw/source/ui/inc/optpage.hxx| 16 +- sw/uiconfig/swriter/ui/optcomparison.ui | 201 8 files changed, 262 insertions(+), 153 deletions(-) New commits: commit c99830c221cd2362d58caac15dd2fb33a2b1ad38 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Thu May 30 17:27:46 2013 +0200 Convert Comparison tab page to .ui Change-Id: Ia1cd8c868de4c73ae518b2775dc568d32a15f16f diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index bfb95fc..3b60502 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -70,7 +70,7 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/chrdlg/paradlg.src \ sw/source/ui/config/mailconfigpage.src \ sw/source/ui/config/optcomp.src \ -sw/source/ui/config/optdlg.src \ + sw/source/ui/config/optdlg.src \ sw/source/ui/config/optload.src \ sw/source/ui/config/redlopt.src \ sw/source/ui/dbui/addresslistdialog.src \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index eb100cf..a01d738 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -94,6 +94,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/newuserindexdialog \ sw/uiconfig/swriter/ui/numparapage \ sw/uiconfig/swriter/ui/numberingnamedialog \ + sw/uiconfig/swriter/ui/optcomparison \ sw/uiconfig/swriter/ui/opttestpage \ sw/uiconfig/swriter/ui/outlinenumbering \ sw/uiconfig/swriter/ui/outlinenumberingpage \ diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 2fa479f..e2c2be3 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -193,7 +193,6 @@ #define HID_OPTCOMPATIBILITY_PAGE SW_HID_OPTCOMPATIBILITY_PAGE #define HID_COMPATIBILITY_OPTIONS_BOX SW_HID_COMPATIBILITY_OPTIONS_BOX -#define HID_COMPARISON_OPT SW_HID_COMPARISON_OPT #define HID_PROPERTYPANEL_WRAP_SECTION SW_HID_PROPERTYPANEL_WRAP_SECTION #define HID_PROPERTYPANEL_WRAP_RB_NO_WRAP SW_HID_PROPERTYPANEL_WRAP_RB_NO_WRAP diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc index 4d716c8..160b8f1 100644 --- a/sw/source/ui/config/optdlg.hrc +++ b/sw/source/ui/config/optdlg.hrc @@ -135,13 +135,4 @@ #define CB_MATH_BASELINE_ALIGNMENT16 -#define FL_CMP 141 -#define RB_AUTO142 -#define RB_WORD143 -#define RB_CHAR144 -#define FL_SET 145 -#define CB_RSID146 -#define CB_IGNORE 147 -#define NF_LEN 148 - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src index 889408f9..b411db0 100644 --- a/sw/source/ui/config/optdlg.src +++ b/sw/source/ui/config/optdlg.src @@ -641,79 +641,4 @@ StringArray STR_PRINTOPTUI }; }; - -/**/ -/**/ -/* TabPage Comparison */ -/**/ -/**/ -TabPage TP_COMPARISON_OPT -{ -HelpID = HID_COMPARISON_OPT; -SVLook = TRUE ; -Hide = TRUE; -Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ); -FixedLine FL_CMP -{ -Pos = MAP_APPFONT ( 6 , 3 ) ; -Size = MAP_APPFONT ( 248 , 8 ) ; -Text [ en-US ] = Compare documents; -}; -RadioButton RB_AUTO -{ -Pos = MAP_APPFONT ( 12 , 14 ) ; -Size = MAP_APPFONT ( 70 , 10 ) ; -Text [ en-US ] = ~Auto; -TabStop = TRUE ; -Group = TRUE ; -}; -RadioButton RB_WORD -{ -Pos = MAP_APPFONT ( 12 , 27 ) ; -Size = MAP_APPFONT ( 70 , 10 ) ; -Text [ en-US ] = By ~word; -}; -RadioButton RB_CHAR -{ -Pos = MAP_APPFONT ( 12 , 40 ) ; -Size = MAP_APPFONT ( 70 , 10 ) ; -Text [ en-US ] = By ~character; -}; -FixedLine FL_SET -{ -Pos = MAP_APPFONT ( 6 , 56 ) ; -Size = MAP_APPFONT ( 248 , 8 ) ; -Text [ en-US ] = Settings; -}; -CheckBox CB_RSID
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk
cui/AllLangResTarget_cui.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 301cfb7a8a263fae20ca3575330325d1a49390c0 Author: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Date: Thu May 30 17:58:18 2013 +0200 Return optgdlg.src file back to AllLangResTarget_cui.mk Change-Id: I84923d35abc75d6f98b97fbc5c8349f30173a3c8 diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk index 252ae34..518444f 100644 --- a/cui/AllLangResTarget_cui.mk +++ b/cui/AllLangResTarget_cui.mk @@ -56,6 +56,7 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\ cui/source/options/optcolor.src \ cui/source/options/optdict.src \ cui/source/options/optfltr.src \ +cui/source/options/optgdlg.src \ cui/source/options/opthtml.src \ cui/source/options/optinet2.src \ cui/source/options/optjava.src \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] prevent increase indent from running outside the cell
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4030 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/4030/1 prevent increase indent from running outside the cell i have take ColWidth value and take out 200 to keep at lesat on letter inside the cell Change-Id: I8d4518845f64044dea2f4ecd393cc625eebc6302 --- M sc/source/core/data/attarray.cxx 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 7ef3103..dc3ab8a 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -1656,12 +1656,15 @@ || ((const SvxHorJustifyItem*)pItem)-GetValue() != SVX_HOR_JUSTIFY_LEFT ); sal_uInt16 nOldValue = ((const SfxUInt16Item)rOldSet.Get( ATTR_INDENT )).GetValue(); sal_uInt16 nNewValue = nOldValue; +//to keep Increment indent from running outside the cell +long nColWidth = (long)pDocument-GetColWidth(nCol,nTab); + if ( bIncrement ) { -if ( nNewValue SC_MAX_INDENT ) +if ( nNewValue nColWidth-200 ) { nNewValue += SC_INDENT_STEP; -if ( nNewValue SC_MAX_INDENT ) nNewValue = SC_MAX_INDENT; +if ( nNewValue nColWidth-200 ) nNewValue = nColWidth-200; } } else -- To view, visit https://gerrit.libreoffice.org/4030 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d4518845f64044dea2f4ecd393cc625eebc6302 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63592 this new patch will solve context numerical proble...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3629 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/3629/1 fdo#63592 this new patch will solve context numerical problem Change-Id: I5598fd9dab823c738a812537743695ec88690a24 --- M sc/source/ui/view/formatsh.cxx 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 3f2b26d..7c66d1c 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -2056,7 +2056,13 @@ { ScTabViewShell* pTabViewShell = GetViewData()-GetViewShell(); pTabViewShell-HideListBox(); // Autofilter-DropDown-Listbox - +bool bEditMode = false; +if ( GetViewData()-HasEditView( GetViewData()-GetActivePart() ) ) + { + bEditMode=true; + SC_MOD()-InputEnterHandler(); + pTabViewShell-UpdateInputHandler(); + } sal_uInt16 nSlot = rReq.GetSlot(); switch( nSlot ) { @@ -2112,6 +2118,8 @@ } break; } +if (bEditMode) +SC_MOD()-SetInputMode( SC_INPUT_TABLE ); } void ScFormatShell::GetTextDirectionState( SfxItemSet rSet ) -- To view, visit https://gerrit.libreoffice.org/3629 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5598fd9dab823c738a812537743695ec88690a24 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#63592 Changing Text Direction take out from edit mode
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3406 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/3406/1 fdo#63592 Changing Text Direction take out from edit mode Change-Id: I6a8156b64c126d5009ca3e81069ad0c525447077 --- M sc/source/ui/view/formatsh.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index d35c0f3..d849c43 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -2056,6 +2056,7 @@ } break; } +SC_MOD()-SetInputMode( SC_INPUT_TABLE ); } void ScFormatShell::GetTextDirectionState( SfxItemSet rSet ) -- To view, visit https://gerrit.libreoffice.org/3406 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a8156b64c126d5009ca3e81069ad0c525447077 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Code enhancement remove duplicate code from presenter consol...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1480 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/1480/1 Code enhancement remove duplicate code from presenter console Change-Id: Ibbb131b64c66307d38a135ac570c1e2ed37bef6c --- M sdext/source/presenter/PresenterWindowManager.cxx 1 file changed, 28 insertions(+), 97 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1480 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibbb131b64c66307d38a135ac570c1e2ed37bef6c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fix RTL presnter console standrad layout mode
abdulmajeed ahmed has abandoned this change. Change subject: Fix RTL presnter console standrad layout mode .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/1028 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I7ba73005f9371dcc844c2e44a3eea99b7aac30f7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: Lior Kaplan kaplanl...@gmail.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#43901 fdo#42577 RTL tollbars mirroring fdo#56412
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1187 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/1187/1 fdo#43901 fdo#42577 RTL tollbars mirroring fdo#56412 Change-Id: I32dd8cdd34965bf8dd31729a79b65d8ee78af7dc --- M vcl/source/window/window.cxx 1 file changed, 1 insertion(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1187 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32dd8cdd34965bf8dd31729a79b65d8ee78af7dc Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fix RTL presnter console standrad layout mode
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1028 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/1028/1 Fix RTL presnter console standrad layout mode Change-Id: I7ba73005f9371dcc844c2e44a3eea99b7aac30f7 --- M sdext/Library_presenter.mk M sdext/source/presenter/PresenterWindowManager.cxx 2 files changed, 42 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1028 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ba73005f9371dcc844c2e44a3eea99b7aac30f7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Modifying comments to meet doxygen standards
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/638 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/638/1 Modifying comments to meet doxygen standards Change-Id: Ibc60c20241b70492aaebcebccb738c7e11fdbb41 --- M sw/inc/node.hxx M sw/inc/numrule.hxx M sw/inc/pagedesc.hxx M sw/inc/pagepreviewlayout.hxx M sw/inc/pam.hxx M sw/inc/paratr.hxx M sw/inc/poolfmt.hxx M sw/inc/printdata.hxx M sw/inc/reffld.hxx M sw/inc/ring.hxx 10 files changed, 447 insertions(+), 447 deletions(-) -- To view, visit https://gerrit.libreoffice.org/638 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc60c20241b70492aaebcebccb738c7e11fdbb41 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Modifying comments to meet doxygen standards
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/596 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/596/1 Modifying comments to meet doxygen standards Change-Id: I363ce532c7d11e798c2a5cc67b1b7893dcd0a389 --- M sw/inc/fmtrfmrk.hxx M sw/inc/fmtruby.hxx M sw/inc/fmturl.hxx M sw/inc/fmtwrapinfluenceonobjpos.hxx M sw/inc/format.hxx M sw/inc/frmfmt.hxx M sw/inc/hhcwrp.hxx M sw/inc/hints.hxx M sw/inc/htmltbl.hxx M sw/inc/iodetect.hxx M sw/inc/istyleaccess.hxx M sw/inc/lineinfo.hxx M sw/inc/ndarr.hxx M sw/inc/ndgrf.hxx M sw/inc/ndhints.hxx M sw/inc/ndole.hxx M sw/inc/ndtxt.hxx 17 files changed, 448 insertions(+), 448 deletions(-) -- To view, visit https://gerrit.libreoffice.org/596 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I363ce532c7d11e798c2a5cc67b1b7893dcd0a389 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#40014 Add new shortcut for page preview CTRL + SHIFT + O
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/587 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/587/1 fdo#40014 Add new shortcut for page preview CTRL + SHIFT + O Change-Id: Ib09b581d5cc8dabf48aceddcc7639ca0e61b72dc --- M officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 1 file changed, 25 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/587 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib09b581d5cc8dabf48aceddcc7639ca0e61b72dc Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice