[Libreoffice-commits] core.git: sd/source sd/uiconfig
sd/source/ui/sidebar/PageMarginUtils.hxx | 158 ++
sd/source/ui/sidebar/SlideBackground.cxx | 188 --
sd/source/ui/sidebar/SlideBackground.hxx | 15 -
sd/uiconfig/simpress/ui/sidebarslidebackground.ui | 107 ++--
4 files changed, 299 insertions(+), 169 deletions(-)
New commits:
commit d5a64f114c101339ed479ea926653c703951fae5
Author: pv2k
Date: Thu Aug 31 01:59:05 2017 +0530
tdf#109100 margin spinboxes in draw's sidebar changed to listbox
Change-Id: Ia59f0fb64f10beab70f449d01b8a25113bea475d
Reviewed-on: https://gerrit.libreoffice.org/41741
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/sd/source/ui/sidebar/PageMarginUtils.hxx
b/sd/source/ui/sidebar/PageMarginUtils.hxx
new file mode 100644
index ..7061a11f9a6a
--- /dev/null
+++ b/sd/source/ui/sidebar/PageMarginUtils.hxx
@@ -0,0 +1,158 @@
+/* -*- 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
+#define SDPAGE_NO_MARGIN 0
+#define SDPAGE_NARROW_VALUE635
+#define SDPAGE_MODERATE_LR 955
+#define SDPAGE_NORMAL_VALUE1000
+#define SDPAGE_WIDE_VALUE1 1270
+#define SDPAGE_WIDE_VALUE2 2540
+#define SDPAGE_WIDE_VALUE3 1590
+#define SDPAGE_UNIT_THRESHOLD 5
+
+namespace sd { namespace sidebar{
+
+bool IsNone( const long nPageLeftMargin, const long nPageRightMargin,
+ const long nPageTopMargin, const long nPageBottomMargin )
+{
+return( std::abs(nPageLeftMargin - SDPAGE_NO_MARGIN) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageRightMargin - SDPAGE_NO_MARGIN ) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageTopMargin - SDPAGE_NO_MARGIN) <= SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageBottomMargin - SDPAGE_NO_MARGIN) <=
SDPAGE_UNIT_THRESHOLD );
+}
+
+void SetNone( long& nPageLeftMargin, long& nPageRightMargin,
+long& nPageTopMargin, long& nPageBottomMargin )
+{
+nPageLeftMargin = SDPAGE_NO_MARGIN;
+nPageRightMargin = SDPAGE_NO_MARGIN;
+nPageTopMargin = SDPAGE_NO_MARGIN;
+nPageBottomMargin = SDPAGE_NO_MARGIN;
+}
+
+bool IsNarrow( const long nPageLeftMargin, const long nPageRightMargin,
+ const long nPageTopMargin, const long nPageBottomMargin )
+{
+return( std::abs(nPageLeftMargin - SDPAGE_NARROW_VALUE) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageRightMargin - SDPAGE_NARROW_VALUE) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageTopMargin - SDPAGE_NARROW_VALUE) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageBottomMargin - SDPAGE_NARROW_VALUE) <=
SDPAGE_UNIT_THRESHOLD );
+}
+
+void SetNarrow( long& nPageLeftMargin, long& nPageRightMargin,
+long& nPageTopMargin, long& nPageBottomMargin )
+{
+nPageLeftMargin = SDPAGE_NARROW_VALUE;
+nPageRightMargin = SDPAGE_NARROW_VALUE;
+nPageTopMargin = SDPAGE_NARROW_VALUE;
+nPageBottomMargin = SDPAGE_NARROW_VALUE;
+}
+
+bool IsModerate( const long nPageLeftMargin, const long nPageRightMargin,
+ const long nPageTopMargin, const long nPageBottomMargin )
+{
+return( std::abs(nPageLeftMargin - SDPAGE_MODERATE_LR) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageRightMargin - SDPAGE_MODERATE_LR) <=
SDPAGE_UNIT_THRESHOLD &&
+std::abs(nPageTopMargin - SDPAGE_WIDE_VALUE1) <= SDPAGE_UNIT_THRESHOLD
&&
+std::abs(nPageBottomMargin - SDPAGE_WIDE_VALUE1) <=
SDPAGE_UNIT_THRESHOLD );
+}
+
+void SetModerate( long& nPageLeftMargin, long& nPageRightMargin,
+long& nPageTopMargin, long& nPageBottomMargin )
+{
+nPageLeftMargin = SDPAGE_MODERATE_LR;
+nPageRightMargin = SDPAGE_MODERATE_LR;
+nPageTopMargin = SDPAGE_WIDE_VALUE1;
+nPageBottomMargin = SDPAGE_WIDE_VALUE1;
+}
+
+bool IsNormal075( const long nPageLeftMargin, const long nPageRightMargin,
+ const long nPageTopMargin, const long nPageBottomMargin )
+{
+return( std::abs(nPageLeftMargin
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/tpgradnt.cxx | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
New commits:
commit bfdd81f72c817ad5cb3fb0ec8636f3a8f08e9170
Author: pv2k
Date: Wed Jun 14 22:26:13 2017 +0530
tdf#105966 Solved Increment:Automatic checkbox problem in Area->Gradient tab
Change-Id: I7025b63df830853867b1b6dd17b7985ec16be83b
Reviewed-on: https://gerrit.libreoffice.org/38882
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index aa58716c61cf..2e38b9db1db0 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -244,7 +244,8 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
(sal_uInt16) m_pMtrCenterY->GetValue(),
(sal_uInt16) m_pMtrBorder->GetValue(),
(sal_uInt16) m_pMtrColorFrom->GetValue(),
-(sal_uInt16) m_pMtrColorTo->GetValue() ));
+(sal_uInt16) m_pMtrColorTo->GetValue(),
+(sal_uInt16) m_pMtrIncrement->GetValue() ));
}
sal_uInt16 nValue = 0;
@@ -340,7 +341,8 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void const *
pControl )
(sal_uInt16) m_pMtrCenterY->GetValue(),
(sal_uInt16) m_pMtrBorder->GetValue(),
(sal_uInt16) m_pMtrColorFrom->GetValue(),
- (sal_uInt16) m_pMtrColorTo->GetValue() );
+ (sal_uInt16) m_pMtrColorTo->GetValue(),
+ (sal_uInt16) m_pMtrIncrement->GetValue() );
// enable/disable controls
if( pControl == m_pLbGradientType || pControl == this )
@@ -415,7 +417,8 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl,
Button*, void)
(sal_uInt16) m_pMtrCenterY->GetValue(),
(sal_uInt16) m_pMtrBorder->GetValue(),
(sal_uInt16) m_pMtrColorFrom->GetValue(),
- (sal_uInt16) m_pMtrColorTo->GetValue() );
+ (sal_uInt16) m_pMtrColorTo->GetValue(),
+ (sal_uInt16) m_pMtrIncrement->GetValue() );
m_pGradientList->Insert(o3tl::make_unique(aXGradient,
aName), nCount);
@@ -453,7 +456,8 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl,
Button*, void)
(sal_uInt16) m_pMtrCenterY->GetValue(),
(sal_uInt16) m_pMtrBorder->GetValue(),
(sal_uInt16) m_pMtrColorFrom->GetValue(),
- (sal_uInt16) m_pMtrColorTo->GetValue() );
+ (sal_uInt16) m_pMtrColorTo->GetValue(),
+ (sal_uInt16) m_pMtrIncrement->GetValue() );
m_pGradientList->Replace(o3tl::make_unique(aXGradient,
aName), nPos);
@@ -573,8 +577,8 @@ void SvxGradientTabPage::ChangeGradientHdl_Impl()
if( pGradient )
{
css::awt::GradientStyle eXGS = pGradient->GetGradientStyle();
-sal_uInt16 nValue = static_cast(
m_rOutAttrs.Get( XATTR_GRADIENTSTEPCOUNT ) ).GetValue();
-if(nValue == 0)
+sal_uInt16 nValue = pGradient->GetSteps();
+if( nValue == 0 )
{
m_pCbIncrement->SetState(TRISTATE_TRUE);
m_pMtrIncrement->Disable();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx sd/sdi sd/source sd/uiconfig svx/sdi sw/inc sw/sdi
include/svx/svxids.hrc| 16 +-
sd/sdi/_drvwsh.sdi| 10 +
sd/source/ui/inc/DrawViewShell.hxx|1
sd/source/ui/sidebar/SlideBackground.cxx | 153
sd/source/ui/sidebar/SlideBackground.hxx | 23 +++
sd/source/ui/view/drviews7.cxx| 96
sd/uiconfig/simpress/ui/sidebarslidebackground.ui | 165 ++
svx/sdi/svx.sdi | 38 +
sw/inc/cmdid.h|2
sw/sdi/swriter.sdi| 36
10 files changed, 494 insertions(+), 46 deletions(-)
New commits:
commit fba28df77d7e98663d1cf77ac206f8799fce4108
Author: pv2k
Date: Thu May 11 23:49:54 2017 +0530
Added margin feature to the Draw's SideBar
Change-Id: I53b5430d1563fcceae29418fd5907ac42ea856e7
Reviewed-on: https://gerrit.libreoffice.org/37626
Reviewed-by: Katarina Behrens
Tested-by: Katarina Behrens
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 91ad64d3ff93..a698c4d91af5 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -236,13 +236,15 @@
#define SID_ATTR_PAGE_MAXSIZE ( SID_SVX_START + 52 )
#define SID_ATTR_PAGE_ORIENTATION ( SID_SVX_START + 53 )
#define SID_ATTR_PAGE_PAPERBIN ( SID_SVX_START + 54 )
-#define SID_ATTR_PAGE_EXT1 ( SID_SVX_START + 56 )
-#define SID_ATTR_PAGE_EXT2 ( SID_SVX_START + 57 )
-#define SID_ATTR_PAGE_HEADERSET ( SID_SVX_START + 58 )
-#define SID_ATTR_PAGE_FOOTERSET ( SID_SVX_START + 59 )
-#define SID_ATTR_PAGE_ON( SID_SVX_START + 60 )
-#define SID_ATTR_PAGE_DYNAMIC ( SID_SVX_START + 61 )
-#define SID_ATTR_PAGE_SHARED( SID_SVX_START + 62 )
+#define SID_ATTR_PAGE_EXT1 ( SID_SVX_START + 55 )
+#define SID_ATTR_PAGE_EXT2 ( SID_SVX_START + 56 )
+#define SID_ATTR_PAGE_HEADERSET ( SID_SVX_START + 57 )
+#define SID_ATTR_PAGE_FOOTERSET ( SID_SVX_START + 58 )
+#define SID_ATTR_PAGE_ON( SID_SVX_START + 59 )
+#define SID_ATTR_PAGE_DYNAMIC ( SID_SVX_START + 60 )
+#define SID_ATTR_PAGE_SHARED( SID_SVX_START + 61 )
+#define SID_ATTR_PAGE_LRSPACE ( SID_SVX_START + 62 )
+#define SID_ATTR_PAGE_ULSPACE ( SID_SVX_START + 63 )
// CAUTION! Range <64 .. 67> used by EditEngine (!)
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 0e9d8eee12e5..833c578eb8f5 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -2603,6 +2603,16 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetPageProperties ;
]
+SID_ATTR_PAGE_LRSPACE
+[
+ExecMethod = SetPageProperties ;
+StateMethod = GetMarginProperties ;
+]
+SID_ATTR_PAGE_ULSPACE
+[
+ExecMethod = SetPageProperties ;
+StateMethod = GetMarginProperties ;
+]
SID_ATTR_PAGE_COLOR
[
ExecMethod = SetPageProperties ;
diff --git a/sd/source/ui/inc/DrawViewShell.hxx
b/sd/source/ui/inc/DrawViewShell.hxx
index 56083d5a2f4d..7a4836f308de 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -159,6 +159,7 @@ public:
voidSetPageProperties (SfxRequest& rReq);
voidGetPageProperties(SfxItemSet& rSet);
+voidGetMarginProperties(SfxItemSet& rSet);
voidGetState (SfxItemSet& rSet);
voidExecute (SfxRequest& rReq);
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index 3d40c8123648..2c881f2a4acb 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -45,7 +45,7 @@
#include
#include "app.hrc"
#include
-#include
+#include
#include
#include
#include
@@ -59,16 +59,41 @@
#include
#include
#include
+#include
#include
#include "EventMultiplexer.hxx"
#include "glob.hrc"
#include
#include
+#include
+#include
+#include
+
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
+namespace
+{
+FieldUnit lcl_GetFieldUnit()
+{
+FieldUnit eUnit = FUNIT_CM;
+const SfxPoolItem* pItem = nullptr;
+SfxItemState eState =
SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(
SID_ATTR_METRIC, pItem );
+if ( pItem && eState >= SfxItemState::DEFAULT )
+{
+
[Libreoffice-commits] core.git: sd/source
sd/source/ui/sidebar/SlideBackground.cxx | 50 +--
sd/source/ui/sidebar/SlideBackground.hxx |4 ++
2 files changed, 39 insertions(+), 15 deletions(-)
New commits:
commit cea458998745f0084271b41d90c92ad27ad071eb
Author: pv2k
Date: Tue May 23 13:07:00 2017 +0530
tdf#106679 UI:SideBar Master Slide Button label corrected
Change-Id: Id3ac678d3b1b28564fc8d7e677caf157b4757bcb
Reviewed-on: https://gerrit.libreoffice.org/37946
Reviewed-by: Katarina Behrens
Tested-by: Katarina Behrens
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index c238260f08d8..dae67c1e1081 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -108,6 +108,10 @@ SlideBackground::SlideBackground(
mbEditModeChangePending(false),
mxFrame(rxFrame),
maContext(),
+maDrawOtherContext(vcl::EnumContext::Application::Draw,
vcl::EnumContext::Context::DrawPage),
+maDrawMasterContext(vcl::EnumContext::Application::Draw,
vcl::EnumContext::Context::MasterPage),
+maImpressOtherContext(vcl::EnumContext::Application::Impress,
vcl::EnumContext::Context::DrawPage),
+maImpressMasterContext(vcl::EnumContext::Application::Impress,
vcl::EnumContext::Context::MasterPage),
maApplication(vcl::EnumContext::Application::NONE),
mbTitle(false),
mpBindings(pBindings)
@@ -146,7 +150,6 @@ void SlideBackground::Initialize()
mpPaperSizeBox->FillPaperSizeEntries( PaperSizeApp::Draw );
mpPaperSizeBox->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
mpPaperOrientation->SetSelectHdl(LINK(this,SlideBackground,PaperSizeModifyHdl));
-mpCloseMaster->Hide();
mpCloseMaster->SetClickHdl(LINK(this, SlideBackground, CloseMasterHdl));
meUnit = maPaperSizeController.GetCoreMetric();
@@ -171,6 +174,25 @@ void SlideBackground::Initialize()
aLayoutName =
aLayoutName.copy(0,aLayoutName.indexOf(SD_LT_SEPARATOR));
mpMasterSlide->SelectEntry(aLayoutName);
}
+
+DrawViewShell* pDrawViewShell =
static_cast(pMainViewShell);
+EditMode eMode = pDrawViewShell->GetEditMode();
+if ( eMode == EditMode::MasterPage )
+{
+mpCloseMaster->Show();
+mpEditMaster->Hide();
+mpMasterSlide->Disable();
+mpDspMasterBackground->Disable();
+mpDspMasterObjects->Disable();
+}
+else
+{
+mpCloseMaster->Hide();
+mpEditMaster->Show();
+mpMasterSlide->Enable();
+mpDspMasterBackground->Enable();
+mpDspMasterObjects->Enable();
+}
}
mpFillStyle->SelectEntryPos(static_cast< sal_Int32 >(NONE));
@@ -187,6 +209,14 @@ void SlideBackground::HandleContextChange(
if (maContext == rContext)
return;
maContext = rContext;
+if ( maContext == maImpressOtherContext || maContext ==
maImpressMasterContext )
+{
+maApplication = vcl::EnumContext::Application::Impress;
+}
+else if ( maContext == maDrawOtherContext || maContext ==
maDrawMasterContext )
+{
+maApplication = vcl::EnumContext::Application::Draw;
+}
}
void SlideBackground::Update()
@@ -390,32 +420,22 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
{
if(!mbTitle)
{
-vcl::EnumContext
aDrawOtherContext(vcl::EnumContext::Application::Draw,
-
vcl::EnumContext::Context::DrawPage);
-vcl::EnumContext
aDrawMasterContext(vcl::EnumContext::Application::Draw,
-
vcl::EnumContext::Context::MasterPage);
-vcl::EnumContext
aImpressOtherContext(vcl::EnumContext::Application::Impress,
-
vcl::EnumContext::Context::DrawPage);
-vcl::EnumContext
aImpressMasterContext(vcl::EnumContext::Application::Impress,
-
vcl::EnumContext::Context::MasterPage);
-if(maContext == aDrawOtherContext || maContext ==
aDrawMasterContext)
+if(maContext == maDrawOtherContext || maContext ==
maDrawMasterContext)
{
mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_NAME));
-maApplication = vcl::EnumContext::Application::Draw;
mpCloseMaster->Hide();
mpEditMaster->Hide();
-if( maContext == aDrawMasterContext)
+if( maContext == maDrawMasterContext)
SetPanelTitle(SdResId(STR_MASTERPAGE_NAME));
else
SetPanelTitle(SdResId(STR_PAGE_NAME));
}
-else if ( maC
[Libreoffice-commits] core.git: include/sfx2 sc/sdi sfx2/sdi
include/sfx2/sfxsids.hrc |1 - sc/sdi/cellsh.sdi|1 - sfx2/sdi/sfx.sdi | 17 - 3 files changed, 19 deletions(-) New commits: commit 0ca9be4982b94701d326e9e994540c6df8aacf00 Author: pv2k Date: Tue Feb 14 18:13:51 2017 +0530 tdf#74739 removed 'PasteOnly' from Tools->customize->keyboard tab->edit Change-Id: I4693b09fa9b16cd5eec60a43c4653aef81860f1d Reviewed-on: https://gerrit.libreoffice.org/34245 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index aaa1988..f497bea 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -407,7 +407,6 @@ // default-ids for macros #define SID_RECORDING_FLOATWINDOW (SID_SFX_START + 800) #define SID_RECORDMACRO (SID_SFX_START + 1669) -#define SID_PASTE_ONLY (SID_SFX_START + 801) #define SID_PASTE_ONLY_TEXT (SID_SFX_START + 802) #define SID_PASTE_ONLY_FORMULA (SID_SFX_START + 803) #define SID_PASTE_ONLY_VALUE(SID_SFX_START + 804) diff --git a/sc/sdi/cellsh.sdi b/sc/sdi/cellsh.sdi index 32230be..9f6f53d 100644 --- a/sc/sdi/cellsh.sdi +++ b/sc/sdi/cellsh.sdi @@ -170,7 +170,6 @@ interface CellSelection SID_COPY[ ExecMethod = ExecuteEdit; StateMethod = GetBlockState; ] SID_PASTE [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] SID_PASTE_SPECIAL [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] -SID_PASTE_ONLY [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] SID_PASTE_ONLY_TEXT [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] SID_PASTE_ONLY_FORMULA [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] SID_PASTE_ONLY_VALUE [ ExecMethod = ExecuteEdit; StateMethod = GetClipState; ] diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 0347532..573afcd 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -3145,23 +3145,6 @@ SfxInt16Item PasteSpecial SID_PASTE_SPECIAL GroupId = GID_EDIT; ] -SfxVoidItem PasteOnly SID_PASTE_ONLY -() -[ -AutoUpdate = FALSE, -FastCall = FALSE, -ReadOnlyDoc = FALSE, -Toggle = FALSE, -Container = FALSE, -RecordAbsolute = FALSE, -RecordPerSet; - -AccelConfig = TRUE, -MenuConfig = TRUE, -ToolBoxConfig = TRUE, -GroupId = GID_EDIT; -] - SfxVoidItem PasteOnlyText SID_PASTE_ONLY_TEXT [ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/sdi
sw/sdi/swriter.sdi |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit a73fb11cb235dd600d29f214f8a079792f6b2445 Author: pv2k Date: Sun Feb 5 02:29:40 2017 +0530 tdf#92492 function placed in a wrong category in customise functions list "Table To Text","Text To Table" and "Text<->Table" have been removed from "Options" category and placed in "Table" category Change-Id: Ic5717e4cf91ce3fde2d40b3a3f567747fa7b983f Reviewed-on: https://gerrit.libreoffice.org/33919 Reviewed-by: Katarina Behrens Tested-by: Katarina Behrens diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index a835734..cb42b58 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -713,7 +713,7 @@ SfxVoidItem ConvertTableText FN_CONVERT_TEXT_TABLE AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, -GroupId = GID_OPTIONS; +GroupId = GID_TABLE; ] SfxVoidItem CreateAbstract FN_ABSTRACT_NEWDOC @@ -6965,7 +6965,7 @@ SfxVoidItem ConvertTableToText FN_CONVERT_TABLE_TO_TEXT AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, -GroupId = GID_OPTIONS; +GroupId = GID_TABLE; ] SfxVoidItem ConvertTextToTable FN_CONVERT_TEXT_TO_TABLE @@ -6990,7 +6990,7 @@ SfxVoidItem ConvertTextToTable FN_CONVERT_TEXT_TO_TABLE AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, -GroupId = GID_OPTIONS; +GroupId = GID_TABLE; ] SfxVoidItem HeadingRowsRepeat FN_TABLE_HEADLINE_REPEAT ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/numpages.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 7a275521a5383f24d9a0c1aea7b61f1b64829190
Author: pv2k
Date: Sat Jan 7 17:27:41 2017 +0530
tdf#46552 fixing preview for bullets/numbering configuration
Change-Id: I959169428d4ed0498a2b78fc7a6ae0815e780648
Reviewed-on: https://gerrit.libreoffice.org/32816
Reviewed-by: Tamás Zolnai
Tested-by: Tamás Zolnai
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index acf23ba..cd81e87 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2544,6 +2544,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext&
rRenderContext, const Rectan
const SvxNumberFormat &rFmt = pActNum->GetLevel(nLevel);
aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart();
sal_uInt16 nXStart( 0 );
+pVDev->SetFillColor( aBackColor );
if (rFmt.GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk
sfx2/UIConfig_sfx.mk |1
sfx2/source/appl/sfxhelp.cxx | 23 +++---
sfx2/uiconfig/ui/helpmanual.ui | 65 +
3 files changed, 84 insertions(+), 5 deletions(-)
New commits:
commit 6a41cef3f9972a88de378a1117697199dbf1d436
Author: pv2k
Date: Mon Nov 28 21:48:43 2016 +0530
tdf#103391: ask user whether to open online help
opens a dialog box from which user can choose to take online help or cancel
it
Change-Id: I8c1278aab88d55901a65c38b15fcc8519360dc59
Reviewed-on: https://gerrit.libreoffice.org/31385
Reviewed-by: Katarina Behrens
Tested-by: Katarina Behrens
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 3d182da..e057deb 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/helpcontrol \
sfx2/uiconfig/ui/helpcontentpage \
sfx2/uiconfig/ui/helpindexpage \
+ sfx2/uiconfig/ui/helpmanual \
sfx2/uiconfig/ui/helpsearchpage \
sfx2/uiconfig/ui/inputdialog \
sfx2/uiconfig/ui/licensedialog \
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 6586e79..80117d0 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -611,12 +611,25 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const
vcl::Window* pWindow, const
if ( !impl_hasHelpInstalled() )
{
-if ( impl_showOnlineHelp( aHelpURL ) )
-return true;
+ScopedVclPtrInstance< MessageDialog > aQueryBox(const_cast<
vcl::Window* >( pWindow ),"onlinehelpmanual","sfx/ui/helpmanual.ui");
+short OnlineHelpBox = aQueryBox->Execute();
+
+if(OnlineHelpBox == RET_OK)
+{
+if ( impl_showOnlineHelp( aHelpURL ) )
+return true;
+else
+{
+ScopedVclPtrInstance< NoHelpErrorBox > aErrBox(const_cast<
vcl::Window* >( pWindow ));
+aErrBox->Execute();
+return false;
+}
+}
+else
+{
+return false;
+}
-ScopedVclPtrInstance< NoHelpErrorBox > aErrBox(const_cast<
vcl::Window* >( pWindow ));
-aErrBox->Execute();
-return false;
}
Reference < XDesktop2 > xDesktop = Desktop::create(
::comphelper::getProcessComponentContext() );
diff --git a/sfx2/uiconfig/ui/helpmanual.ui b/sfx2/uiconfig/ui/helpmanual.ui
new file mode 100644
index 000..ac6ab51
--- /dev/null
+++ b/sfx2/uiconfig/ui/helpmanual.ui
@@ -0,0 +1,65 @@
+
+
+
+
+
+False
+False
+dialog
+True
+question
+ %PRODUCTNAME built-in help is
not installed
+
+
+False
+vertical
+2
+
+
+False
+True
+end
+
+
+Read Help
Online
+True
+True
+False
+True
+
+
+True
+True
+0
+
+
+
+
+gtk-cancel
+True
+True
+True
+True
+True
+True
+
+
+True
+True
+1
+
+
+
+
+False
+False
+0
+
+
+
+
+
+ website
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/inc/numpages.hxx |1 +
cui/source/tabpages/numpages.cxx | 10 ++
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 610bc5aa161e726135feee0c7f64331df090475a
Author: pv2k
Date: Wed Dec 21 04:06:18 2016 +0530
tdf#89932 bullets and numbering position tab level-1
Fixed the problem of not showing the default values on level-1
Change-Id: I167694d090a6c4cd8064250837d290efabfad21c
Reviewed-on: https://gerrit.libreoffice.org/32261
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index afaaf1e..0b4f0c5 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -404,6 +404,7 @@ class SvxNumPositionTabPage : public SfxTabPage
MapUnit eCoreUnit;
boolbModified : 1;
+boolbDefault: 1;
boolbPreset : 1;
boolbInInintControl : 1; // workaround for
Modify-error, is said to be corrected from 391 on
boolbLabelAlignmentPosAndSpaceModeActive;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 790d4a2..b70662d 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2639,6 +2639,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window*
pParent,
, nActNumLvl(SAL_MAX_UINT16)
, nNumItemId(SID_ATTR_NUMBERING_RULE)
, bModified(false)
+, bDefault(true)
, bPreset(false)
, bInInintControl(false)
, bLabelAlignmentPosAndSpaceModeActive(false)
@@ -2914,7 +2915,7 @@ void SvxNumPositionTabPage::InitControls()
m_pAlign2LB->SetNoSelection();
}
-if ( bSameLabelFollowedBy )
+if ( bSameLabelFollowedBy || bDefault )
{
sal_Int32 nPos = 0; // LISTTAB
if ( aNumFmtArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::SPACE )
@@ -2936,7 +2937,7 @@ void SvxNumPositionTabPage::InitControls()
{
m_pListtabFT->Enable();
m_pListtabMF->Enable();
-if ( bSameListtab )
+if ( bSameListtab || bDefault )
{
SetMetricValue(*m_pListtabMF, aNumFmtArr[nLvl]->GetListtabPos(),
eCoreUnit);
}
@@ -2952,7 +2953,7 @@ void SvxNumPositionTabPage::InitControls()
m_pListtabMF->SetText("");
}
-if ( bSameAlignAt )
+if ( bSameAlignAt || bDefault )
{
SetMetricValue(*m_pAlignedAtMF,
aNumFmtArr[nLvl]->GetIndentAt() +
aNumFmtArr[nLvl]->GetFirstLineIndent(),
@@ -2963,7 +2964,7 @@ void SvxNumPositionTabPage::InitControls()
m_pAlignedAtMF->SetText("");
}
-if ( bSameIndentAt )
+if ( bSameIndentAt || bDefault )
{
SetMetricValue(*m_pIndentAtMF, aNumFmtArr[nLvl]->GetIndentAt(),
eCoreUnit);
}
@@ -3234,6 +3235,7 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl,
ListBox&, rBox, void )
{
sal_uInt16 nSaveNumLvl = nActNumLvl;
nActNumLvl = 0;
+bDefault = false;
if(rBox.IsEntryPosSelected( pActNum->GetLevelCount() ) &&
(rBox.GetSelectEntryCount() == 1 || nSaveNumLvl != 0x))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
