[Libreoffice-commits] core.git: Changes to 'refs/changes/14/2614/4'
___ 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/14/2614/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/14/2614/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/14/2614/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/08/1908/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/08/1908/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/1806/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/06/1806/4'
___ 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/97/3497/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/06/1806/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/79/3279/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/1806/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/97/3497/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/71/3271/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/3271/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/24/4024/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/24/4024/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/24/4024/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/grfpage.cxx | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) New commits: commit c6019d89314be0ff85acf29ae9115c153cf31562 Author: Abdulaziz A Alayed Date: Wed Jun 4 12:04:55 2014 +0300 fdo#79243 UI:fix preview in imageCorp tap in writer Change-Id: If13cabc21d804c9383b26f7ee5a40800cacc76a5 diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 252d7e7..ad48045 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -491,8 +491,16 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) m_pRightMF->SetValue( m_pRightMF->Normalize( nRight ), eUnit ); } } -m_pExampleWN->SetLeft(nLeft); -m_pExampleWN->SetRight(nRight); +if (Application::GetSettings().GetLayoutRTL()) +{ +m_pExampleWN->SetLeft(nRight); +m_pExampleWN->SetRight(nLeft); +} +else +{ +m_pExampleWN->SetLeft(nLeft); +m_pExampleWN->SetRight(nRight); +} if(bZoom) { // scale stays, recompute width ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/output2.cxx | 27 +++ 1 file changed, 3 insertions(+), 24 deletions(-) New commits: commit f08c1edc0a99e0c29fb1614162d3e88c5660e092 Author: Abdulaziz A Alayed Date: Sun Jan 12 16:02:37 2014 +0300 fdo#32530 calc:alignment depend on 1st char direct depending on the first char text direction we'll use the appropriate text alignment as Mr:Eyal suggest. and what Mr:Eike have done before. Change-Id: I87ead619e9eb0c001e4bbd701cb97232fa1da854 diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 9c09b5c..911cc11 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -1405,12 +1405,9 @@ bool beginsWithRTLCharacter(const OUString& rStr) right alignment is returned. */ static SvxCellHorJustify getAlignmentFromContext( SvxCellHorJustify eInHorJust, -bool bCellIsValue, const OUString& rText, -const ScPatternAttr& rPattern, const SfxItemSet* pCondSet, -const ScDocument* pDoc, SCTAB nTab ) +bool bCellIsValue, const OUString& rText) { SvxCellHorJustify eHorJustContext = eInHorJust; -bool bUseWritingDirection = false; if (eInHorJust == SVX_HOR_JUSTIFY_STANDARD) { // fdo#32530: Default alignment depends on value vs @@ -1419,23 +1416,6 @@ static SvxCellHorJustify getAlignmentFromContext( SvxCellHorJustify eInHorJust, eHorJustContext = bCellIsValue ? SVX_HOR_JUSTIFY_LEFT : SVX_HOR_JUSTIFY_RIGHT; else if (bCellIsValue) eHorJustContext = SVX_HOR_JUSTIFY_RIGHT; -else -bUseWritingDirection = true; -} - -if (bUseWritingDirection || -eInHorJust == SVX_HOR_JUSTIFY_BLOCK || eInHorJust == SVX_HOR_JUSTIFY_REPEAT) -{ -sal_uInt16 nDirection = lcl_GetValue( rPattern, ATTR_WRITINGDIR, pCondSet); -if (nDirection == FRMDIR_HORI_LEFT_TOP || nDirection == FRMDIR_VERT_TOP_LEFT) -eHorJustContext = SVX_HOR_JUSTIFY_LEFT; -else if (nDirection == FRMDIR_ENVIRONMENT) -{ -SAL_WARN_IF( !pDoc, "sc.ui", "getAlignmentFromContext - pDoc==NULL"); -eHorJustContext = (pDoc && pDoc->IsLayoutRTL(nTab)) ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT; -} -else -eHorJustContext = SVX_HOR_JUSTIFY_RIGHT; } return eHorJustContext; } @@ -1714,8 +1694,7 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) bCellIsValue = pFCell->IsRunning() || pFCell->IsValue(); } -eOutHorJust = getAlignmentFromContext( aVars.GetHorJust(), bCellIsValue, aVars.GetString(), -*pPattern, pCondSet, mpDoc, nTab); +eOutHorJust = getAlignmentFromContext( aVars.GetHorJust(), bCellIsValue, aVars.GetString()); bool bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust() == SVX_HOR_JUSTIFY_BLOCK ); // #i111387# #o11817313# disable automatic line breaks only for "General" number format @@ -4644,7 +4623,7 @@ void ScOutputData::DrawEdit(sal_Bool bPixelToLogic) DrawEditParam aParam(pPattern, pCondSet, lcl_SafeIsValue(aCell)); aParam.meHorJustContext = getAlignmentFromContext( aParam.meHorJustAttr, -aParam.mbCellIsValue, aStr, *pPattern, pCondSet, mpDoc, nTab); +aParam.mbCellIsValue, aStr); aParam.meHorJustResult = (aParam.meHorJustAttr == SVX_HOR_JUSTIFY_BLOCK) ? SVX_HOR_JUSTIFY_BLOCK : aParam.meHorJustContext; aParam.mbPixelToLogic = bPixelToLogic; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools svtools/source sw/source
include/svtools/ruler.hxx|2 +- svtools/source/control/ruler.cxx |6 +- sw/source/ui/misc/swruler.cxx|6 +- 3 files changed, 11 insertions(+), 3 deletions(-) New commits: commit d86a72b64f208fe55f302d9fd8a7f578a4275bb8 Author: Abdulaziz A Alayed Date: Wed Sep 18 13:18:32 2013 +0300 fdo#69280 fixing comments toggle button position when local set to RTL language Change-Id: I0c133e3bbb6801f56e9ac0f508961bfa07a19523 Conflicts: svtools/source/control/ruler.cxx diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 9382cb0..8f34c23 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -808,7 +808,7 @@ public: const Link& GetExtraDownHdl() const { return maExtraDownHdl; } voidSetTextRTL(sal_Bool bRTL); - +boolGetTextRTL(); voidSetCharWidth( long nWidth ) { mnCharWidth = nWidth ; } voidSetLineHeight( long nHeight ) { mnLineHeight = nHeight ; } diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 6a356c6..91bb084 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2728,7 +2728,6 @@ void Ruler::DrawTab( OutputDevice* pDevice, const Color &rFillColor, const Point ImplDrawRulerTab( pDevice, aPos, nTabStyle, nStyle ); pDevice->Pop(); } - void Ruler::SetTextRTL(sal_Bool bRTL) { if(mpData->bTextRTL != (bool) bRTL) @@ -2770,6 +2769,11 @@ long Ruler::GetRulerVirHeight() const return mnVirHeight; } +bool Ruler::GetTextRTL() +{ +return mpData->bTextRTL; +} + RulerUnitData Ruler::GetCurrentRulerUnit() const { return aImplRulerUnitTab[mnUnitIndex]; diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/ui/misc/swruler.cxx index 76fb8be..f0838f3 100644 --- a/sw/source/ui/misc/swruler.cxx +++ b/sw/source/ui/misc/swruler.cxx @@ -246,6 +246,7 @@ void SwCommentRuler::UpdateCommentHelpText() // TODO Make Ruler return its central rectangle instead of margins. Rectangle SwCommentRuler::GetCommentControlRegion() { +long nLeft = 0; SwPostItMgr *pPostItMgr = mpViewShell->GetPostItMgr(); //rhbz#1006850 When the SwPostItMgr ctor is called from SwView::SwView it @@ -255,7 +256,10 @@ Rectangle SwCommentRuler::GetCommentControlRegion() return Rectangle(); //FIXME When the page width is larger then screen, the ruler is misplaced by one pixel -long nLeft = GetWinOffset() + GetPageOffset() + mpSwWin->LogicToPixel(Size(GetPageWidth(), 0)).Width(); +if (GetTextRTL()) + nLeft = GetPageOffset() - pPostItMgr->GetSidebarWidth(true) + GetBorderOffset(); +else + nLeft = GetWinOffset() + GetPageOffset() + mpSwWin->LogicToPixel(Size(GetPageWidth(), 0)).Width(); long nTop= 0 + 4; // Ruler::ImplDraw uses RULER_OFF (value: 3px) as offset, and Ruler::ImplFormat adds one extra pixel // Somehow pPostItMgr->GetSidebarBorderWidth() returns border width already doubled long nRight = nLeft+ pPostItMgr->GetSidebarWidth(true) + pPostItMgr->GetSidebarBorderWidth(true); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6-7' - vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit ebbe6b781151428272a0a3235f5eefc42c06a82e Author: Abdulaziz A Alayed Date: Fri May 24 13:11:31 2013 +0300 fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL tab opened with LTR UI. Reviewed-on: https://gerrit.libreoffice.org/4024 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann (cherry picked from commit 898a3e84807bccbb876e3f5583728f6d24e05e9a) Conflicts: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811 Reviewed-on: https://gerrit.libreoffice.org/4540 Reviewed-by: Björn Michaelsen Tested-by: Lior Kaplan Reviewed-by: Faisal al-otaibi Tested-by: Faisal al-otaibi Reviewed-by: Lior Kaplan Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx old mode 100644 new mode 100755 index 9623555..c0d9740 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1027,7 +1027,13 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; if (!rNativeContentRegion.GetHeight()) rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; -returnVal = sal_True; +//fdo#63254 horizontal scrool bar isn't displayed in RTL tab +// with LTR UI in calc +returnVal =Application::GetSettings().GetLayoutRTL(); + +//See fdo#44582, Horizontal scrollbar in navigator window is broken +if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT) && Application::GetSettings().GetLayoutRTL()) +returnVal = false; } if( (nType == CTRL_MENUBAR) && (nPart == PART_ENTIRE_CONTROL) ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/AllLangResTarget_sd.mk sd/inc sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/AllLangResTarget_sd.mk |1 sd/UIConfig_simpress.mk |1 sd/inc/helpids.h|1 sd/source/ui/app/sdmod2.cxx |1 sd/source/ui/dlg/prntopts.cxx | 252 +++-- sd/source/ui/dlg/prntopts.src | 214 -- sd/source/ui/inc/prntopts.hrc | 47 --- sd/source/ui/inc/prntopts.hxx | 47 +-- sd/uiconfig/simpress/ui/prntopts.ui | 517 9 files changed, 645 insertions(+), 436 deletions(-) New commits: commit df8875509b823c3ab1626df8946e6d9295bfd8dd Author: Abdulaziz A Alayed Date: Mon Jun 10 13:15:20 2013 +0200 convert impress and draw print page to .ui format Change-Id: I4f72ca2f1d090fede24c7d7441f1855c617ab315 diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index 5466ad3..6b7b144 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\ sd/source/ui/dlg/PaneDockingWindow.src \ sd/source/ui/dlg/paragr.src \ sd/source/ui/dlg/prltempl.src \ -sd/source/ui/dlg/prntopts.src \ sd/source/ui/dlg/RemoteDialog.src \ sd/source/ui/dlg/sdpreslt.src \ sd/source/ui/dlg/tabtempl.src \ diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index db9f2c5..16d0cae 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -78,6 +78,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/photoalbum \ sd/uiconfig/simpress/ui/customslideshows \ sd/uiconfig/simpress/ui/optimpressgeneralpage \ + sd/uiconfig/simpress/ui/prntopts \ )) # vim: set noet sw=4 ts=4: diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index 8fb2364..bbace93 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -23,7 +23,6 @@ #define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL" #define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL" #define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL" -#define HID_SD_PRINT_OPTIONS "SD_HID_SD_PRINT_OPTIONS" #define HID_SD_OPTIONS_SNAP "SD_HID_SD_OPTIONS_SNAP" #define HID_SD_AUTOPILOT_PAGE1 "SD_HID_SD_AUTOPILOT_PAGE1" #define HID_SD_AUTOPILOT_PAGE2 "SD_HID_SD_AUTOPILOT_PAGE2" diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index ed8e7c2..e07fd6e 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -66,7 +66,6 @@ #include "sdpage.hxx" #include "sdxfer.hxx" #include "sdabstdlg.hxx" -#include "prntopts.hrc" #include /** retrieves the page that is currently painted. This will only be the master page diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index d70a42e..c67e429 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -19,7 +19,6 @@ #include "sdattr.hxx" #include "optsitem.hxx" -#include "prntopts.hrc" #include "sdresid.hxx" #include "prntopts.hxx" #include "app.hrc" @@ -30,59 +29,47 @@ * dialog to adjust print options */ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) : -SfxTabPage ( pParent, SdResId( TP_PRINT_OPTIONS ), rInAttrs ), - -aGrpPrint ( this, SdResId( GRP_PRINT ) ), -aCbxDraw( this, SdResId( CBX_DRAW ) ), -aCbxNotes ( this, SdResId( CBX_NOTES ) ), -aCbxHandout ( this, SdResId( CBX_HANDOUTS ) ), -aCbxOutline ( this, SdResId( CBX_OUTLINE ) ), - -aSeparator1FL( this, SdResId( FL_SEPARATOR1 ) ), -aGrpOutput ( this, SdResId( GRP_OUTPUT ) ), -aRbtColor ( this, SdResId( RBT_COLOR ) ), -aRbtGrayscale ( this, SdResId( RBT_GRAYSCALE ) ), -aRbtBlackWhite ( this, SdResId( RBT_BLACKWHITE ) ), - -aGrpPrintExt( this, SdResId( GRP_PRINT_EXT ) ), -aCbxPagename( this, SdResId( CBX_PAGENAME ) ), -aCbxDate( this, SdResId( CBX_DATE ) ), -aCbxTime( this, SdResId( CBX_TIME ) ), -aCbxHiddenPages ( this, SdResId( CBX_HIDDEN_PAGES ) ), - -aSeparator2FL( this, SdResId( FL_SEPARATOR2 ) ), -aGrpPageoptions ( this, SdResId( GRP_PAGE ) ), -aRbtDefault ( this, SdResId( RBT_DEFAULT ) ), -aRbtPagesize( this, SdResId( RBT_PAGESIZE ) ), -aRbtPagetile( this, SdResId( RBT_PAGETILE )
[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/tpprint.hxx|6 - sc/source/ui/optdlg/tpprint.cxx | 32 +++ sc/source/ui/src/optdlg.src | 35 sc/uiconfig/scalc/ui/optdlg.ui | 165 7 files changed, 183 insertions(+), 61 deletions(-) New commits: commit b8400dbf46aeffd5991f71511ae27368d46a5c40 Author: Abdulaziz A Alayed Date: Tue Jun 4 12:12:33 2013 +0200 Convert Calc Print option page to .ui. Change-Id: Ida482cb280c3ec3ae05af053861f19c13f8a1d78 diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 94a8aea..27563d3 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -98,6 +98,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/sortwarning \ sc/uiconfig/scalc/ui/textimportoptions \ sc/uiconfig/scalc/ui/textimportcsv \ + sc/uiconfig/scalc/ui/optdlg \ )) # vim: set noet sw=4 ts=4: diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 8bbc07a..9744a35 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -64,7 +64,6 @@ #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_PRINT "SC_HID_SCPAGE_PRINT" #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 515ddcb..78fdf85 100644 --- a/sc/source/ui/inc/optdlg.hrc +++ b/sc/source/ui/inc/optdlg.hrc @@ -56,10 +56,6 @@ #define STR_COPYERR 9 // TP_PRINT: -#define FL_PAGES1 -#define BTN_SKIPEMPTYPAGES 2 -#define FL_SHEETS 2 -#define BTN_SELECTEDSHEETS 4 // TP_LCONTENT diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 0babe41..2b9eac7 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -27,10 +27,8 @@ class ScTpPrintOptions : public SfxTabPage { -FixedLine aPagesFL; -CheckBoxaSkipEmptyPagesCB; -FixedLine aSheetsFL; -CheckBoxaSelectedSheetsCB; +CheckBox* m_pSkipEmptyPagesCB; +CheckBox* m_pSelectedSheetsCB; ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreSet ); ~ScTpPrintOptions(); diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 9ca45c1..cdfc5eb 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -34,14 +34,12 @@ ScTpPrintOptions::ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage ( pParent, - ScResId( RID_SCPAGE_PRINT ), - rCoreAttrs ), -aPagesFL ( this, ScResId( FL_PAGES ) ), -aSkipEmptyPagesCB( this, ScResId( BTN_SKIPEMPTYPAGES ) ), -aSheetsFL( this, ScResId( FL_SHEETS ) ), -aSelectedSheetsCB( this, ScResId( BTN_SELECTEDSHEETS ) ) + "optCalcPrintPage", + "modules/scalc/ui/optdlg.ui", + rCoreAttrs ) { -FreeResource(); +get( m_pSkipEmptyPagesCB , "suppressCB" ); +get( m_pSelectedSheetsCB , "printCB" ); } ScTpPrintOptions::~ScTpPrintOptions() @@ -79,16 +77,16 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_PRINT_SELECTEDSHEET, false , &pItem ) ) { sal_Bool bChecked = ( (const SfxBoolItem*)pItem )->GetValue(); -aSelectedSheetsCB.Check( bChecked ); +m_pSelectedSheetsCB->Check( bChecked ); } else { -aSelectedSheetsCB.Check( !aOptions.GetAllSheets() ); +m_pSelectedSheetsCB->Check( !aOptions.GetAllSheets() ); } -aSkipEmptyPagesCB.Check( aOptions.GetSkipEmpty() ); -aSkipEmptyPagesCB.SaveValue(); -aSelectedSheetsCB.SaveValue(); +m_pSkipEmptyPagesCB->Check( aOptions.GetSkipEmpty() ); +m_pSkipEmptyPagesCB->SaveValue(); +m_pSelectedSheetsCB->SaveValue(); } // --- @@ -97,18 +95,18 @@ sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET ); -bool bSkipEmptyCha
[ABANDONED] code enhancement remove dublicate code
Abdulaziz A Alayed has abandoned this change. Change subject: code enhancement remove dublicate code .. Patch Set 2: Abandoned -- To view, visit https://gerrit.libreoffice.org/3279 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ic58e4cc4f9adb40553488d5975111219d8e3d7e8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulaziz A Alayed Gerrit-Reviewer: Noel Grandin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 5e0733e904d25b45a08fd410c0f94b196322cf94 Author: Abdulaziz A Alayed Date: Fri May 24 13:11:31 2013 +0300 fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL tab opened with LTR UI. Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811 Reviewed-on: https://gerrit.libreoffice.org/4024 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann (cherry picked from commit 898a3e84807bccbb876e3f5583728f6d24e05e9a) diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx old mode 100644 new mode 100755 index 7e16bfb..0a0fe89 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1048,8 +1048,9 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; if (!rNativeContentRegion.GetHeight()) rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; - -returnVal = true; +//fdo#63254 horizontal scrool bar isn't displayed in RTL tab +// with LTR UI in calc +returnVal =Application::GetSettings().GetLayoutRTL(); //See fdo#44582, Horizontal scrollbar in navigator window is broken if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT) && Application::GetSettings().GetLayoutRTL()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit d2fcf1ec2e1363d568f1f2023e21013b968f4354 Author: Abdulaziz A Alayed Date: Fri May 24 13:11:31 2013 +0300 fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL tab opened with LTR UI. Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811 Reviewed-on: https://gerrit.libreoffice.org/4024 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann Signed-off-by: Petr Mladek diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx old mode 100644 new mode 100755 index e15fbfa..1455850 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1041,8 +1041,9 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; if (!rNativeContentRegion.GetHeight()) rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; - -returnVal = true; +//fdo#63254 horizontal scrool bar isn't displayed in RTL tab +// with LTR UI in calc +returnVal =Application::GetSettings().GetLayoutRTL(); //See fdo#44582, Horizontal scrollbar in navigator window is broken if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT) && Application::GetSettings().GetLayoutRTL()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 898a3e84807bccbb876e3f5583728f6d24e05e9a Author: Abdulaziz A Alayed Date: Fri May 24 13:11:31 2013 +0300 fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL tab opened with LTR UI. Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811 Reviewed-on: https://gerrit.libreoffice.org/4024 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx old mode 100644 new mode 100755 index 7e16bfb..0a0fe89 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1048,8 +1048,9 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; if (!rNativeContentRegion.GetHeight()) rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; - -returnVal = true; +//fdo#63254 horizontal scrool bar isn't displayed in RTL tab +// with LTR UI in calc +returnVal =Application::GetSettings().GetLayoutRTL(); //See fdo#44582, Horizontal scrollbar in navigator window is broken if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT) && Application::GetSettings().GetLayoutRTL()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4024 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/4024/1 fdo#63254 UI:Horizontal scroll bar isn't displayed when RTL tab opened with LTR UI. Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811 --- M vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 29f7542..e3b1275 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1048,8 +1048,9 @@ rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; if (!rNativeContentRegion.GetHeight()) rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; - -returnVal = true; +//fdo#63254 horizontal scrool bar isn't displayed in RTL tab +// with LTR UI in calc +returnVal =!Application::GetSettings().GetLayoutRTL() ? false : true; //See fdo#44582, Horizontal scrollbar in navigator window is broken if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT) && Application::GetSettings().GetLayoutRTL()) -- To view, visit https://gerrit.libreoffice.org/4024 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iff6899539fe0b1788df7b09f91f850b91bcdb811 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulaziz A Alayed ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 89feda6bfdeacb647d44cb432d5ebc2678c44c89 Author: Abdulaziz A Alayed Date: Mon Apr 8 10:59:16 2013 +0300 fdo#55432 fix the context menu position for RTL sheet Change-Id: I023215646b9aeadb4909c9f90f84f9e8b0dbd173 Reviewed-on: https://gerrit.libreoffice.org/3497 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 145b887e..1a66c97 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2995,6 +2995,9 @@ void ScGridWindow::Command( const CommandEvent& rCEvt ) else if ( !bMouse ) { // non-edit menu by keyboard -> use lower right of cell cursor position +ScDocument* aDoc = pViewData->GetDocument(); +SCTAB nTabNo = pViewData->GetTabNo(); +sal_Bool bLayoutIsRTL = aDoc->IsLayoutRTL(nTabNo); SCCOL nCurX = pViewData->GetCurX(); SCROW nCurY = pViewData->GetCurY(); @@ -3002,7 +3005,8 @@ void ScGridWindow::Command( const CommandEvent& rCEvt ) long nSizeXPix; long nSizeYPix; pViewData->GetMergeSizePixel( nCurX, nCurY, nSizeXPix, nSizeYPix ); -aMenuPos.X() += nSizeXPix; +// fdo#55432 take the correct position for RTL sheet +aMenuPos.X() += bLayoutIsRTL ? -nSizeXPix : nSizeXPix; aMenuPos.Y() += nSizeYPix; if (pViewData) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] code enhancement remove dublicate code
cursor in overlapped cells -ScDocument* pDoc = pViewData->GetDocument(); -const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab); +const ScPatternAttr* pPattern = pScGridDocument->GetPattern(nX,nY,TabNumber); const ScMergeFlagAttr& rMergeFlag = (const ScMergeFlagAttr&) pPattern->GetItem(ATTR_MERGE_FLAG); sal_Bool bOverlapped = rMergeFlag.IsOverlapped(); @@ -5409,12 +5356,11 @@ if ( bVis && !bOverlapped && !pViewData->HasEditView(eWhich) && pViewData->IsActive() ) { Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, sal_True ); -sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); // completely right of/below the screen? // (test with logical start position in aScrPos) sal_Bool bMaybeVisible; -if ( bLayoutRTL ) +if ( pScGridDocument->IsLayoutRTL(TabNumber) ) bMaybeVisible = ( aScrPos.X() >= -2 && aScrPos.Y() >= -2 ); else { @@ -5427,7 +5373,7 @@ long nSizeYPix; pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); -if ( bLayoutRTL ) +if ( pScGridDocument->IsLayoutRTL(TabNumber) ) aScrPos.X() -= nSizeXPix - 2; // move instead of mirroring // Now, draw the cursor. @@ -5570,7 +5516,7 @@ // get the AutoFill handle rectangle in pixels // -if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() && +if ( bAutoMarkVisible && aAutoMarkPos.Tab() == TabNumber && !pViewData->HasEditView(eWhich) && pViewData->IsActive() ) { SCCOL nX = aAutoMarkPos.Col(); @@ -5580,15 +5526,11 @@ // Autofill mark is not visible. Bail out. return; -SCTAB nTab = pViewData->GetTabNo(); -ScDocument* pDoc = pViewData->GetDocument(); -sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); - Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, sal_True ); long nSizeXPix; long nSizeYPix; pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); -if ( bLayoutRTL ) +if ( pScGridDocument->IsLayoutRTL(TabNumber) ) aFillPos.X() -= nSizeXPix + 3; else aFillPos.X() += nSizeXPix - 2; @@ -5656,7 +5598,6 @@ SCCOL nX2 = bDragRect ? nDragEndX : aPagebreakDrag.aEnd.Col(); SCROW nY2 = bDragRect ? nDragEndY : aPagebreakDrag.aEnd.Row(); -SCTAB nTab = pViewData->GetTabNo(); SCCOL nPosX = pViewData->GetPosX(WhichH(eWhich)); SCROW nPosY = pViewData->GetPosY(WhichV(eWhich)); @@ -5669,17 +5610,15 @@ long nSizeXPix=0; long nSizeYPix=0; -ScDocument* pDoc = pViewData->GetDocument(); double nPPTX = pViewData->GetPPTX(); double nPPTY = pViewData->GetPPTY(); SCCOLROW i; -sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); -long nLayoutSign = bLayoutRTL ? -1 : 1; +long nLayoutSign = pScGridDocument->IsLayoutRTL(TabNumber) ? -1 : 1; if (ValidCol(nX2) && nX2>=nX1) for (i=nX1; i<=nX2; i++) -nSizeXPix += ScViewData::ToPixel( pDoc->GetColWidth( static_cast(i), nTab ), nPPTX ); +nSizeXPix += ScViewData::ToPixel( pScGridDocument->GetColWidth( static_cast(i), TabNumber ), nPPTX ); else { aScrPos.X() -= nLayoutSign; @@ -5688,7 +5627,7 @@ if (ValidRow(nY2) && nY2>=nY1) for (i=nY1; i<=nY2; i++) -nSizeYPix += ScViewData::ToPixel( pDoc->GetRowHeight( i, nTab ), nPPTY ); +nSizeYPix += ScViewData::ToPixel( pScGridDocument->GetRowHeight( i, TabNumber ), nPPTY ); else { aScrPos.Y() -= 1; @@ -5699,7 +5638,7 @@ aScrPos.Y() -= 2; Rectangle aRect( aScrPos.X(), aScrPos.Y(), aScrPos.X() + ( nSizeXPix + 2 ) * nLayoutSign, aScrPos.Y() + nSizeYPix + 2 ); -if ( bLayoutRTL ) +if ( pScGridDocument->IsLayoutRTL(TabNumber) ) { aRect.Left() = aRect.Right(); // end position is left aRect.Right() = aScrPos.X(); @@ -5825,8 +5764,8 @@ Rectangle aPixRect; ScRange aRange; -SCTAB nTab = pViewData->GetTabNo(); -if ( pViewData->IsRefMode() && nTab >= pViewData->GetRefStartZ() && nTab <= pViewData->GetRefEndZ() && + +if ( pViewData->IsRefMode() && TabNumber >= pViewData->GetRefStartZ() && TabNumber <= pViewData->GetRefEndZ() && pViewData->GetDelMark( aRange ) ) { //! limit to visible area -- To view, visit https://gerrit.libreoffice.org/3279 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic58e4cc4f9adb40553488d5975111219d8e3d7e8 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulaziz A Alayed ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#55432 fix the context menu position for RTL sheet
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3271 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/3271/1 fdo#55432 fix the context menu position for RTL sheet Change-Id: I7961f7e47cabef6b06e66e5495a231b7b8b5f24b --- M sc/source/ui/view/gridwin.cxx 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 145b887e..f7f7931 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2995,6 +2995,9 @@ else if ( !bMouse ) { // non-edit menu by keyboard -> use lower right of cell cursor position +ScDocument* aDoc = pViewData->GetDocument(); +SCTAB tabNo = pViewData->GetTabNo(); +sal_Bool LayoutIsRTL = aDoc->IsLayoutRTL(tabNo); SCCOL nCurX = pViewData->GetCurX(); SCROW nCurY = pViewData->GetCurY(); @@ -3002,8 +3005,9 @@ long nSizeXPix; long nSizeYPix; pViewData->GetMergeSizePixel( nCurX, nCurY, nSizeXPix, nSizeYPix ); -aMenuPos.X() += nSizeXPix; -aMenuPos.Y() += nSizeYPix; +// fdo#55432 take the correct position for RTL sheet +aMenuPos.X() = LayoutIsRTL ? aMenuPos.X() -= nSizeXPix : aMenuPos.X() += nSizeXPix; +aMenuPos.Y() = nSizeYPix; if (pViewData) { -- To view, visit https://gerrit.libreoffice.org/3271 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7961f7e47cabef6b06e66e5495a231b7b8b5f24b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulaziz A Alayed ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git:
0 files changed New commits: commit 32e593dc2da4266567cf80ee6bea7917e56572c7 Author: Abdulaziz A Alayed Date: Sat Mar 9 15:35:45 2013 +0300 fdo#57422 fixing scroll bar and slides position fixing scroll bar position and slides sorter of note view and slides if the interface language is RTL . Change-Id: I80b55dff621d6b994095ad7a4979bcca63371edf Change-Id: Ibc7c8992b8f177742dc52df2615a2d32a2a22713 Reviewed-on: https://gerrit.libreoffice.org/2614 Reviewed-by: Faisal al-otaibi Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/presenter/PresenterNotesView.cxx | 134 sdext/source/presenter/PresenterSlideSorter.cxx | 108 --- 2 files changed, 144 insertions(+), 98 deletions(-) New commits: commit b977c27383b36f511bcedc8cd48c160a1c0be514 Author: Abdulaziz A Alayed Date: Sat Mar 9 15:35:45 2013 +0300 fdo#57422 fixing scroll bar and slides position fixing scroll bar position and slides sorter of note view and slides if the interface language is RTL . Change-Id: I80b55dff621d6b994095ad7a4979bcca63371edf diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index deb248f..2ffb8ce 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -16,7 +16,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - +#include "vcl/svapp.hxx" #include "PresenterNotesView.hxx" #include "PresenterButton.hxx" #include "PresenterCanvasHelper.hxx" @@ -431,80 +431,90 @@ void PresenterNotesView::Layout (void) { if ( ! mxParentWindow.is()) return; - awt::Rectangle aWindowBox (mxParentWindow->getPosSize()); geometry::RealRectangle2D aNewTextBoundingBox (0,0,aWindowBox.Width, aWindowBox.Height); - // Size the tool bar and the horizontal separator above it. if (mxToolBarWindow.is()) -{ -const geometry::RealSize2D aToolBarSize (mpToolBar->GetMinimalSize()); -const sal_Int32 nToolBarHeight = sal_Int32(aToolBarSize.Height + 0.5); -mxToolBarWindow->setPosSize(0, aWindowBox.Height - nToolBarHeight, -sal_Int32(aToolBarSize.Width + 0.5), nToolBarHeight, -awt::PosSize::POSSIZE); -aNewTextBoundingBox.Y2 -= nToolBarHeight; - -mnSeparatorYLocation = aWindowBox.Height - nToolBarHeight - gnSpaceBelowSeparator; -aNewTextBoundingBox.Y2 = mnSeparatorYLocation - gnSpaceAboveSeparator; - -// Place the close button. -if (mpCloseButton.get() != NULL) -mpCloseButton->SetCenter(geometry::RealPoint2D( -(aWindowBox.Width + aToolBarSize.Width) / 2, -aWindowBox.Height - aToolBarSize.Height/2)); -} - -// Check whether the vertical scroll bar is necessary. -if (mpScrollBar.get() != NULL) -{ -bool bShowVerticalScrollbar (false); -try { -const double nTextBoxHeight (aNewTextBoundingBox.Y2 - aNewTextBoundingBox.Y1); -const double nHeight (mpTextView->GetTotalTextHeight()); -if (nHeight > nTextBoxHeight) -{ -bShowVerticalScrollbar = true; -aNewTextBoundingBox.X2 -= mpScrollBar->GetSize(); -} -mpScrollBar->SetTotalSize(nHeight); +const geometry::RealSize2D aToolBarSize (mpToolBar->GetMinimalSize()); +const sal_Int32 nToolBarHeight = sal_Int32(aToolBarSize.Height + 0.5); +mxToolBarWindow->setPosSize(0, aWindowBox.Height - nToolBarHeight, +sal_Int32(aToolBarSize.Width + 0.5), nToolBarHeight, +awt::PosSize::POSSIZE); +aNewTextBoundingBox.Y2 -= nToolBarHeight; +mnSeparatorYLocation = aWindowBox.Height - nToolBarHeight - gnSpaceBelowSeparator; +aNewTextBoundingBox.Y2 = mnSeparatorYLocation - gnSpaceAboveSeparator; +// Place the close button. +if (mpCloseButton.get() != NULL) +mpCloseButton->SetCenter(geometry::RealPoint2D( + (aWindowBox.Width + aToolBarSize.Width) / 2, + aWindowBox.Height - aToolBarSize.Height/2)); } -catch(beans::UnknownPropertyException&) +// Check whether the vertical scroll bar is necessary. +if (mpScrollBar.get() != NULL) { -OSL_ASSERT(false); +bool bShowVerticalScrollbar (false); +try +{ +const double nTextBoxHeight (aNewTextBoundingBox.Y2 - aNewTextBoundingBox.Y1); +const double nHeight (mpTextView->GetTotalTextHeight()); +if (nHeight > nTextBoxHeight) +{ +bShowVerticalScrollbar = true; +if(!Application::GetSettings().GetLayoutRTL()) +aNewTextBoundingBox.X2 -= mpScrollBar->GetSize(); +else +aNewTextBoundingBox.X1 += mpScrollBar->GetSize(); +} +mpScrollBar->
[PATCH] fdo#57422 fixing scroll bar and slides position
rLocalPoint.Y - mnVerticalOffset + maBoundingBox.Y1); +} +else +{ +return css::geometry::RealPoint2D( + rLocalPoint.X - mnHorizontalOffset + maBoundingBox.X1, + rLocalPoint.Y - mnVerticalOffset + maBoundingBox.Y1); +} } sal_Int32 PresenterSlideSorter::Layout::GetColumn ( @@ -1313,13 +1348,14 @@ awt::Rectangle PresenterSlideSorter::Layout::GetBoundingBox (const sal_Int32 nSlideIndex) const { -const geometry::RealPoint2D aWindowPosition(GetWindowPosition(GetPoint(nSlideIndex, -1, -1))); +bool isRTL = Application::GetSettings().GetLayoutRTL(); +const geometry::RealPoint2D aWindowPosition(GetWindowPosition(GetPoint(nSlideIndex, isRTL?1:-1, -1))); return PresenterGeometryHelper::ConvertRectangle( -geometry::RealRectangle2D( -aWindowPosition.X, -aWindowPosition.Y, -aWindowPosition.X + maPreviewSize.Width, -aWindowPosition.Y + maPreviewSize.Height)); + geometry::RealRectangle2D( + aWindowPosition.X, + aWindowPosition.Y, + aWindowPosition.X + maPreviewSize.Width, + aWindowPosition.Y + maPreviewSize.Height)); } void PresenterSlideSorter::Layout::ForAllVisibleSlides (const ::boost::function& rAction) -- To view, visit https://gerrit.libreoffice.org/2614 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc7c8992b8f177742dc52df2615a2d32a2a22713 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulaziz A Alayed ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#44582 fixing horizontal scroll bar in sub windows
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1806 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/1806/1 fdo#44582 fixing horizontal scroll bar in sub windows Change-Id: Ifea57dec77c5b23771684a1e46267f8431478075 --- M vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 46a4c01..00abced 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1036,11 +1036,14 @@ rNativeContentRegion = rNativeBoundingRegion; //See fdo#33523, possibly makes sense to do this test for all return values -if (!rNativeContentRegion.GetWidth()) -rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; -if (!rNativeContentRegion.GetHeight()) -rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; -returnVal = sal_True; +if(!Application::GetSettings().GetLayoutRTL()) +{ +if (!rNativeContentRegion.GetWidth()) +rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; +if (!rNativeContentRegion.GetHeight()) +rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; +returnVal = sal_True; +} } if( (nType == CTRL_MENUBAR) && (nPart == PART_ENTIRE_CONTROL) ) { -- To view, visit https://gerrit.libreoffice.org/1806 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifea57dec77c5b23771684a1e46267f8431478075 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulaziz A Alayed ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice