cppcanvas/source/mtfrenderer/implrenderer.cxx | 14 +++++++ sc/uiconfig/scalc/ui/optdlg.ui | 47 +------------------------- 2 files changed, 16 insertions(+), 45 deletions(-)
New commits: commit 7906c680575374e9cfc68ca991985a63e21ff30d Author: Armin Le Grand <[email protected]> Date: Tue Jun 4 15:07:09 2013 +0000 Related: #i120994# Avoid same error for META_TEXTFILLCOLOR_ACTION... and META_TEXTLINECOLOR_ACTION (cherry picked from commit 839e9f69c68fd32a17fc90d31a68f0b2f0c2fff1) Change-Id: I259ffb9d4710aae2334fd27c1ee0bbab0679df76 diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 59fead1b..769df3d 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1519,6 +1519,13 @@ namespace cppcanvas rStates.getState().textFillColor, rCanvas ); } + else + { + // #120994# Do switch on/off TextFillColor, even when a overriding one is set + bool bSetting(static_cast<MetaTextFillColorAction*>(pCurrAct)->IsSetting()); + + rStates.getState().isTextFillColorSet = bSetting; + } break; case META_TEXTLINECOLOR_ACTION: @@ -1529,6 +1536,13 @@ namespace cppcanvas rStates.getState().textLineColor, rCanvas ); } + else + { + // #120994# Do switch on/off TextLineColor, even when a overriding one is set + bool bSetting(static_cast<MetaTextLineColorAction*>(pCurrAct)->IsSetting()); + + rStates.getState().isTextLineColorSet = bSetting; + } break; case META_TEXTALIGN_ACTION: commit 64ae8beec66a36064a49c2e7c6f46073a645f64c Author: Caolán McNamara <[email protected]> Date: Tue Jun 4 17:23:55 2013 +0100 restore original mnemonics and drop empty slots/grids Change-Id: I836b24db36161e6d7c71722b6f9bb4b176e21990 diff --git a/sc/uiconfig/scalc/ui/optdlg.ui b/sc/uiconfig/scalc/ui/optdlg.ui index 115f589..7426d34 100644 --- a/sc/uiconfig/scalc/ui/optdlg.ui +++ b/sc/uiconfig/scalc/ui/optdlg.ui @@ -1,13 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> - <object class="GtkAdjustment" id="adjustment1"> - <property name="lower">1</property> - <property name="upper">99</property> - <property name="value">1</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> <object class="GtkBox" id="optCalcPrintPage"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -34,7 +27,7 @@ <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="suppressCB"> - <property name="label" translatable="yes">Suppress output of empty pages</property> + <property name="label" translatable="yes">_Suppress output of empty pages</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -48,36 +41,6 @@ <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">6</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> </object> </child> </object> @@ -119,7 +82,7 @@ <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="printCB"> - <property name="label" translatable="yes">Print only selected sheets</property> + <property name="label" translatable="yes">_Print only selected sheets</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -133,12 +96,6 @@ <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> </object>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
