[Libreoffice-commits] core.git: officecfg/registry svx/source

2021-12-10 Thread Julien Nabet (via logerrit)
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 
-
 svx/source/tbxctrls/tbunosearchcontrollers.cxx   |2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b60bc1e597032e598caf43d1a13409068b800f57
Author: Julien Nabet 
AuthorDate: Tue Dec 7 20:48:32 2021 +0100
Commit: Julien Nabet 
CommitDate: Fri Dec 10 12:22:48 2021 +0100

Related tdf#102506: make Find Bar Ctrl+F searching by value by default

Change-Id: I4c001b60eecbcdae95cde6d79cc91bb887d7a742
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126490
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 3fb594e55739..d615c04a0d00 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1658,7 +1658,10 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   
   
 
-  Find Text
+  Find Values
+
+
+  Find text in values, to search in formulas 
use the dialog
 
   
   
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx 
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 75a08ed16973..6deb930c18f2 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -169,6 +169,8 @@ void impl_executeSearch( const css::uno::Reference< 
css::uno::XComponentContext
 
 auto aArgs( comphelper::InitPropertySequence( {
 { "SearchItem.SearchString", css::uno::makeAny( sFindText ) },
+// Related tdf#102506: make Find Bar Ctrl+F searching by value by 
default
+{ "SearchItem.CellType", css::uno::makeAny( 
sal_Int16(SvxSearchCellType::VALUE) ) },
 { "SearchItem.Backward", css::uno::makeAny( aSearchBackwards ) },
 { "SearchItem.SearchFlags", css::uno::makeAny( sal_Int32(0) ) },
 { "SearchItem.TransliterateFlags", css::uno::makeAny( 
static_cast(nFlags) ) },


[Libreoffice-commits] core.git: officecfg/registry svx/source

2020-05-06 Thread Mike Kaganski (via logerrit)
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |1 +
 svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx|6 ++
 svx/source/sdr/properties/graphicproperties.cxx  |2 ++
 3 files changed, 9 insertions(+)

New commits:
commit 65f3aea4727123a75dbd471592fe711998b5209b
Author: Mike Kaganski 
AuthorDate: Tue Apr 21 12:00:50 2020 +0300
Commit: Mike Kaganski 
CommitDate: Wed May 6 14:05:41 2020 +0200

tdf#101181: implement glow effect also for SdrGrafPrimitive2D

... using the implementation from f9fc420dceb1ece2c98767da16a21aaff771f140
that is already functional for SdrCustomShapePrimitive2D. For now, only for
Draw/Impress.

Change-Id: I4936e8276df2b21cb5c438e89c215b819e9b8a40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92636
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index d0ceb287d714..ddf07b32f5a2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -549,6 +549,7 @@
   
 Calc,   Draw,   hidden  ;
 DrawImpress,Draw,   hidden  ;
+DrawImpress,Graphic,hidden  ;
 WriterVariants, Draw,   hidden  ;
   
 
diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx 
b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
index 77dc73145e33..9f15f4d9fc41 100644
--- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
@@ -125,6 +125,12 @@ namespace drawinglayer::primitive2d
 aTranslateGrf.getY());
 }
 
+if (!aRetval.empty() && 
!getSdrLFSTAttribute().getGlow().isDefault())
+{
+// glow
+aRetval = createEmbeddedGlowPrimitive(aRetval, 
getSdrLFSTAttribute().getGlow());
+}
+
 rContainer.insert(rContainer.end(), aRetval.begin(), 
aRetval.end());
 }
 
diff --git a/svx/source/sdr/properties/graphicproperties.cxx 
b/svx/source/sdr/properties/graphicproperties.cxx
index ec19696c2d78..35d8e832679a 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -67,6 +67,8 @@ namespace sdr::properties
 // range from SdrGrafObj
 SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST,
 
+SDRATTR_GLOW_FIRST, SDRATTR_GLOW_LAST,
+
 // range from SdrTextObj
 EE_ITEMS_START, EE_ITEMS_END>{});
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: officecfg/registry svx/source

2017-11-03 Thread Tomaž Vajngerl
 officecfg/registry/data/org/openoffice/Office/Common.xcu   |4 ++--
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 +++---
 svx/source/dialog/ClassificationDialog.cxx |4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit bcdc5f56f064e875f58a2f22872393d1fef31839
Author: Tomaž Vajngerl 
Date:   Sat Nov 4 02:37:07 2017 +0900

TSCP: make the configuration key names shorter

Change-Id: If28e283666f4e1f87758c401b2d4fb5986eb6d8c
Reviewed-on: https://gerrit.libreoffice.org/44281
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu 
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 33c1db97f618..c7d198e38cd4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -539,9 +539,9 @@
   
   
   
-  
+  
   
-  
+  
   
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 22c92a7124fa..8eeced165011 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6393,15 +6393,15 @@
 
 3
   
-  
+  
 
Specifies if the intellectual property section in the 
advanced classification dialog should be expanded when the dialog is 
open.
 
 true
   
-  
+  
 
-   Specifies if the intellectual property text is free-form or 
limited to ';', '/' and ' ' characters.
+   Specifies if the intellectual property text in the advanced 
classification is free-form or limited to ';', '/' and ' ' (space) and delete 
key.
 
 true
   
diff --git a/svx/source/dialog/ClassificationDialog.cxx 
b/svx/source/dialog/ClassificationDialog.cxx
index 6c70d97dd83f..3210d1a2f761 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -41,7 +41,7 @@ VCL_BUILDER_FACTORY(IntellectualPropertyPartEdit)
 
 void IntellectualPropertyPartEdit::KeyInput(const KeyEvent& rKeyEvent)
 {
-bool bTextIsFreeForm = 
officecfg::Office::Common::Classification::AdvancedClassificationDialogIntellectualPropertyTextInputIsFreeForm::get();
+bool bTextIsFreeForm = 
officecfg::Office::Common::Classification::IntellectualPropertyTextInputIsFreeForm::get();
 
 if (bTextIsFreeForm)
 {
@@ -230,7 +230,7 @@ ClassificationDialog::ClassificationDialog(vcl::Window* 
pParent, const bool bPer
 
 m_pRecentlyUsedListBox->SetSelectHdl(LINK(this, ClassificationDialog, 
SelectRecentlyUsedHdl));
 
-bool bExpand = 
officecfg::Office::Common::Classification::AdvancedClassificationDialogIntellectualPropertySectionExpanded::get();
+bool bExpand = 
officecfg::Office::Common::Classification::IntellectualPropertySectionExpanded::get();
 m_pIntellectualPropertyExpander->set_expanded(bExpand);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: officecfg/registry svx/source

2016-01-25 Thread Rishabh
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |3 ++-
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx  |2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8fb5502b25f0ca0e97e3eb07b68d89d21ee3d0ec
Author: Rishabh 
Date:   Sun Jan 24 03:58:08 2016 +0530

Make Position and Size sidebar tab visible when a line is selected

Regression bug introduced by - https://gerrit.libreoffice.org/#/c/16165/ 
and removal of obsolete writer code.

Change-Id: I8ab2e0c04b5c90fafdb43f34899053df7bd7fb4e
Reviewed-on: https://gerrit.libreoffice.org/21739
Reviewed-by: Jochen Nitschke 
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 92071f8..6982bb0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -451,7 +451,6 @@
 DrawImpress,TextObject, hidden  ;
 DrawImpress,OLE,hidden  ;
 WriterVariants, Draw,   visible ;
-WriterVariants, DrawLine,   visible ;
   
 
 
@@ -505,6 +504,7 @@
   
 Calc,   Chart,   visible   ;
 Calc,   Draw,hidden;
+Calc,   DrawLine,visible   ;
 Calc,   Form,visible   ;
 Calc,   Graphic, hidden;
 Calc,   Media,   visible   ;
@@ -512,6 +512,7 @@
 Calc,   OLE, visible   ;
 DrawImpress,3DObject,visible   ;
 DrawImpress,Draw,hidden;
+DrawImpress,DrawLine,visible   ;
 DrawImpress,Form,visible   ;
 DrawImpress,Graphic, hidden;
 DrawImpress,Media,   visible   ;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 53d72b6..e198505 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -284,8 +284,10 @@ void PosSizePropertyPanel::HandleContextChange(
 break;
 
 case CombinedEnumContext(Application_Calc, Context_Draw):
+case CombinedEnumContext(Application_Calc, Context_DrawLine):
 case CombinedEnumContext(Application_Calc, Context_Graphic):
 case CombinedEnumContext(Application_DrawImpress, Context_Draw):
+case CombinedEnumContext(Application_DrawImpress, Context_DrawLine):
 case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
 case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
 bShowPosition = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: officecfg/registry svx/source sw/inc sw/sdi sw/source sw/uiconfig

2016-01-05 Thread Gulsah Kose
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 +++
 svx/source/tbxctrls/tbxdrctl.cxx|   13 
-
 sw/inc/cmdid.h  |1 
 sw/sdi/_viewsh.sdi  |5 ++
 sw/sdi/swriter.sdi  |   24 
++
 sw/source/uibase/app/swmodule.cxx   |1 
 sw/uiconfig/swriter/toolbar/standardbar.xml |1 
 7 files changed, 50 insertions(+), 3 deletions(-)

New commits:
commit 1949cc74b929e13799686b22b450ded8dbf4c064
Author: Gulsah Kose 
Date:   Sun Jan 3 19:49:54 2016 +0200

tdf#90187 Added uno command for track changes bar.

v2: Solved dimmed button problem and changed controller class
for listen trackchangesbar button.

Change-Id: I5a921ad9bb6c8e53d3043e86492d0923a998f3d2
Signed-off-by: Gulsah Kose 
Reviewed-on: https://gerrit.libreoffice.org/21064
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index fff1246..7910f0b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -232,6 +232,14 @@
   1
 
   
+  
+
+  Show Track Changes Bar
+
+
+  1
+
+  
   
 
   ~Show Changes
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 0c40f0a..a7de724 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -55,10 +55,17 @@ void SAL_CALL SvxTbxCtlDraw::initialize( const 
css::uno::Sequence< css::uno::Any
  * "private:resource/toolbar/toolbar" in draw and impress. Control is 
added for this
  * difference.
  */
-if ( m_sModuleName == "com.sun.star.presentation.PresentationDocument" || 
m_sModuleName == "com.sun.star.drawing.DrawingDocument" )
-m_sToolboxName="private:resource/toolbar/toolbar";
+if( m_aCommandURL==".uno:TrackChangesBar")
+{
+m_sToolboxName="private:resource/toolbar/changes";
+}
 else
-m_sToolboxName="private:resource/toolbar/drawbar";
+{
+if ( m_sModuleName == "com.sun.star.presentation.PresentationDocument" 
|| m_sModuleName == "com.sun.star.drawing.DrawingDocument" )
+m_sToolboxName="private:resource/toolbar/toolbar";
+else
+m_sToolboxName="private:resource/toolbar/drawbar";
+}
 }
 
 
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index cd0ce77..acb112b 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -701,6 +701,7 @@
 #define FN_SELECTION_MODE_DEFAULT   (FN_SELECTION + 90)   /* use default 
selection mode - not block mode */
 #define FN_SELECTION_MODE_BLOCK (FN_SELECTION + 91)   /* switch on block 
selection */
 #define SID_JUMP_TO_SPECIFIC_PAGE(FN_SELECTION + 92)
+#define SID_TRACK_CHANGES_BAR   (FN_SELECTION + 93)   /* shows/hides track 
changes bar */
 
 // QUERY-Block
 #define FN_TXTATR_INET  (FN_QUERY +29)  /* INet-Attribut */
diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi
index 78deb1f..58573f4 100644
--- a/sw/sdi/_viewsh.sdi
+++ b/sw/sdi/_viewsh.sdi
@@ -803,6 +803,11 @@ interface BaseTextEditView
 StateMethod = StateViewOptions ;
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
+SID_TRACK_CHANGES_BAR
+[
+ExecMethod = ExecViewOptions ;
+StateMethod = StateViewOptions ;
+]
 }
 
 interface GlobalContents
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index a80d38c..f43ed50 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -91,6 +91,30 @@ SfxBoolItem TrackChanges FN_REDLINE_ON
 GroupId = GID_EDIT;
 ]
 
+SfxAllEnumItem TrackChangesBar SID_TRACK_CHANGES_BAR
+
+[
+/* flags: */
+AutoUpdate = TRUE,
+Cachable = Cachable,
+FastCall = FALSE,
+HasCoreId = FALSE,
+HasDialog = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+Synchron;
+
+Readonly = FALSE,
+
+/* config: */
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+StatusBarConfig = FALSE,
+ToolBoxConfig = TRUE,
+GroupId = GID_EDIT;
+]
+
 SfxVoidItem AddAllUnknownWords FN_ADD_UNKNOWN
 ()
 [
diff --git a/sw/source/uibase/app/swmodule.cxx 
b/sw/source/uibase/app/swmodule.cxx
index 2e86864..0f3af65 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -286,6 +286,7 @@ void SwDLL::RegisterControls()
 SwModule* pMod = SW_MOD();
 
 SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod );
+

[Libreoffice-commits] core.git: officecfg/registry svx/source

2015-11-03 Thread Yousuf Philips
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +-
 svx/source/tbxctrls/tbcontrl.src|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c3822aa796616b64b040559c537ee4dcc786f249
Author: Yousuf Philips 
Date:   Mon Nov 2 18:54:49 2015 +0400

tdf#86595 Change 'Highlighting' to 'Highlight Color'

Change-Id: I11ef97b4b4589d21afc40e862bb68a512db18831
Reviewed-on: https://gerrit.libreoffice.org/19741
Reviewed-by: Maxim Monastirsky 
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index f378a79..ddb9cef 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2205,7 +2205,7 @@
   
   
 
-  Highlighting
+  Highlight Color
 
 
   1
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index f6cd746..456496c 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -122,7 +122,7 @@ Menu RID_SVX_STYLE_MENU
 
 String RID_SVXSTR_EXTRAS_CHARBACKGROUND
 {
-Text [ en-US ] = "Highlighting" ;
+Text [ en-US ] = "Highlight Color" ;
 };
 
 String RID_SVXSTR_CHAR_BACK_COLOR
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: officecfg/registry svx/source

2015-10-27 Thread Aybuke Ozdemir
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 -
 svx/source/gallery2/galctrl.cxx|   20 +++--
 svx/source/tbxctrls/fontworkgallery.cxx|   17 ++-
 3 files changed, 10 insertions(+), 29 deletions(-)

New commits:
commit 9b322ace3b8f316104f7138b082d2ffdb282c816
Author: Aybuke Ozdemir 
Date:   Fri Oct 23 23:12:08 2015 +0300

tdf#88548 fontwork gallery always have transparent/checkered background.

Change-Id: I8995ef12edb64c14788ba3a2c3c1c2ceb3775b11

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index ac5b634..d693fc7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6359,7 +6359,7 @@
   
   Shows previews with shining through checkered background to 
visualize transparency.
  
- true
+ false

 
 
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 69da8fe..0cf63b8 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -257,23 +257,13 @@ void GalleryPreview::PreviewMedia( const INetURLObject& 
rURL )
 
 void drawTransparenceBackground(vcl::RenderContext& rOut, const Point& rPos, 
const Size& rSize)
 {
-const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
 
-if (rStyleSettings.GetPreviewUsesCheckeredBackground())
-{
-// draw checkered background
-static const sal_uInt32 nLen(8);
-static const Color aW(COL_WHITE);
-static const Color aG(0xef, 0xef, 0xef);
+// draw checkered background
+static const sal_uInt32 nLen(8);
+static const Color aW(COL_WHITE);
+static const Color aG(0xef, 0xef, 0xef);
 
-rOut.DrawCheckered(rPos, rSize, nLen, aW, aG);
-}
-else
-{
-rOut.SetLineColor();
-rOut.SetFillColor(rStyleSettings.GetFieldColor());
-rOut.DrawRect(Rectangle(rPos, rSize));
-}
+rOut.DrawCheckered(rPos, rSize, nLen, aW, aG);
 }
 
 GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* 
pTheme ) :
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx 
b/svx/source/tbxctrls/fontworkgallery.cxx
index d8fde7f..ac814fa 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -115,7 +115,6 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16 
nThemeId)
 
 sal_uInt32 nModelPos;
 FmFormModel *pModel = NULL;
-const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
 
 for( nModelPos = 0; nModelPos < nFavCount; nModelPos++ )
 {
@@ -133,19 +132,11 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16 
nThemeId)
 
 pVDev->SetOutputSizePixel(aSize);
 
-if(rStyleSettings.GetPreviewUsesCheckeredBackground())
-{
-static const sal_uInt32 nLen(8);
-static const Color aW(COL_WHITE);
-static const Color aG(0xef, 0xef, 0xef);
+static const sal_uInt32 nLen(8);
+static const Color aW(COL_WHITE);
+static const Color aG(0xef, 0xef, 0xef);
 
-pVDev->DrawCheckered(aNull, aSize, nLen, aW, aG);
-}
-else
-{
-pVDev->SetBackground(rStyleSettings.GetFieldColor());
-pVDev->Erase();
-}
+pVDev->DrawCheckered(aNull, aSize, nLen, aW, aG);
 
 pVDev->DrawBitmapEx(aNull, aThumb);
 maFavoritesHorizontal.push_back(pVDev->GetBitmap(aNull, aSize));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: officecfg/registry svx/source

2015-01-12 Thread Caolán McNamara
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +-
 svx/source/gallery2/galctrl.cxx|1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 8b2a9a37306a7febf28e419280d1782ff230761a
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jan 12 16:54:45 2015 +

Resolves: fdo#79975 toggle checkered background back on

Change-Id: Id856d8dbf437acb7e528e60b4d1b012102ff0557

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 4b5c789..4140ca5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6350,7 +6350,7 @@
   /desc
   labelShows previews with shining through checkered background to 
visualize transparency./label
  /info
- valuefalse/value
+ valuetrue/value
/prop
 /group
 group oor:name=ExternalApps oor:extensible=true
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 90537ac..4665fd8 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -272,7 +272,6 @@ void drawTransparenceBackground(OutputDevice rOut, const 
Point rPos, const Siz
 }
 }
 
-
 GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* 
pTheme ) :
 ValueSet( pParent, WB_TABSTOP | WB_3DLOOK | WB_BORDER | WB_ITEMBORDER 
| WB_DOUBLEBORDER | WB_VSCROLL | WB_FLATVALUESET ),
 DropTargetHelper( this ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits