[Libreoffice-commits] core.git: 4 commits - include/svx sc/uiconfig sd/source sd/uiconfig svx/source sw/uiconfig
Maxim Monastirsky
momonasmon at gmail.com
Sun May 18 04:51:50 PDT 2014
include/svx/dialogs.hrc | 1
include/svx/linectrl.hxx | 18 ----
include/svx/tbcontrl.hxx | 25 +++++
sc/uiconfig/scalc/toolbar/drawobjectbar.xml | 2
sd/source/ui/app/sddll.cxx | 2
sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml | 2
sd/uiconfig/simpress/toolbar/drawingobjectbar.xml | 2
svx/source/sidebar/line/LinePropertyPanel.cxx | 2
svx/source/tbxctrls/linectrl.cxx | 77 -----------------
svx/source/tbxctrls/tbcontrl.cxx | 95 ++++++++++++++++++++--
svx/source/tbxctrls/tbcontrl.src | 5 +
svx/source/tbxctrls/tbxcolorupdate.cxx | 3
sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml | 2
sw/uiconfig/sweb/toolbar/drawingobjectbar.xml | 2
sw/uiconfig/swform/toolbar/drawingobjectbar.xml | 2
sw/uiconfig/swreport/toolbar/drawingobjectbar.xml | 2
sw/uiconfig/swriter/toolbar/drawingobjectbar.xml | 2
sw/uiconfig/swxform/toolbar/drawingobjectbar.xml | 2
18 files changed, 133 insertions(+), 113 deletions(-)
New commits:
commit 14b05361b8f8f5953289d1c8b03528fa0d3838cd
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun May 18 13:26:54 2014 +0300
Fix last color detection
Change-Id: Idb0f90a3f2100211689c3ede1dfedda86edb9728
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 617b8c3..d3a055e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1244,7 +1244,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
else if ( pState->ISA( XLineColorItem ) )
rColor = ((const XLineColorItem*)pState)->GetColorValue();
- for ( size_t i = 1; i < aColorSet.GetItemCount(); i++ )
+ for ( size_t i = 1; i <= aColorSet.GetItemCount(); ++i )
{
if ( rColor == aColorSet.GetItemColor(i) )
{
commit a1fc526845df5b8641c996a9f96a25e323771dd4
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun May 18 13:26:31 2014 +0300
That's actually a pointer
Change-Id: I9d6333646f8ef366f63ff09e089c84517d9756e7
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 93c5981..617b8c3 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2404,10 +2404,10 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
return pColorWin;
}
-IMPL_LINK(SvxColorToolBoxControl, SelectedHdl, Color*, aColor)
+IMPL_LINK(SvxColorToolBoxControl, SelectedHdl, Color*, pColor)
{
- pBtnUpdater->Update( *aColor );
- mLastColor = *aColor;
+ pBtnUpdater->Update( *pColor );
+ mLastColor = *pColor;
return 0;
}
commit e4ce7d286a5039e5a65ba994bd1b168679d4a7c3
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun May 18 08:38:16 2014 +0300
fdo#46839 Convert line color picker to split button
Change-Id: I4987cc9ffba675009f2d2ae9f6b12ed4ee02fe13
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 09a122d..f35a97f 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -260,6 +260,7 @@
#define RID_SVXSTR_MORE (RID_SVX_START + 198)
#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE (RID_SVX_START + 199)
#define RID_SVXSTR_CHARFONTNAME (RID_SVX_START + 200)
+#define RID_SVXSTR_LINECOLOR (RID_SVX_START + 201)
// Strings for insert/overwrite mode
#define RID_SVXSTR_INSERT_HELPTEXT (RID_SVX_START + 210)
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index 1419b65..4beb9bd 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -30,7 +30,6 @@ class XLineStyleItem;
class XLineDashItem;
class SvxLineBox;
class SvxMetricField;
-class SvxColorBox;
// SvxLineStyleController:
@@ -74,23 +73,6 @@ public:
};
-// SvxLineColorController:
-
-
-class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl
-{
-public:
- SFX_DECL_TOOLBOX_CONTROL();
-
- SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
- virtual ~SvxLineColorToolBoxControl();
-
- virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
- const SfxPoolItem* pState ) SAL_OVERRIDE;
- void Update( const SfxPoolItem* pState );
- virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE;
-};
-
// class SvxLineEndWindow
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index e086b0e..1694d13 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -66,6 +66,11 @@
for 3D extrusion
Execute-Id SID_EXTRUSION_3D_COLOR
+ SvxLineColorToolBoxControl
+ --------------------------
+ Item type: XLineColorItem
+ Execute-Id SID_ATTR_LINE_COLOR
+
SvxPatternToolBoxControl
------------------------
Item type: SvxBrushItem
@@ -230,6 +235,26 @@ public:
};
+// class SvxLineColorToolBoxControl --------------------------------------
+
+class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl
+{
+ ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > pBtnUpdater;
+ Color mLastColor;
+ DECL_LINK( SelectedHdl, Color* );
+public:
+ SFX_DECL_TOOLBOX_CONTROL();
+ SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
+ virtual ~SvxLineColorToolBoxControl();
+
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
+ const SfxPoolItem* pState ) SAL_OVERRIDE;
+ virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
+ virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE;
+ virtual void Select(sal_uInt16 nSelectModifier) SAL_OVERRIDE;
+};
+
+
// class SvxFrameToolBoxControl ------------------------------------------
class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl
diff --git a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
index fb67067..81e44a4 100644
--- a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
+++ b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml
@@ -25,7 +25,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="10172"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown" toolbar:helpid="10172"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
<toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
index 9e81074..23a905a 100644
--- a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
@@ -27,7 +27,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="10172"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown" toolbar:helpid="10172"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
<toolbar:toolbarseparator/>
diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
index eed7d1b..162acea 100644
--- a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
+++ b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
@@ -27,7 +27,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="10172"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown" toolbar:helpid="10172"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
<toolbar:toolbarseparator/>
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 0f8e8c7..072517d 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -203,7 +203,7 @@ LinePropertyPanel::LinePropertyPanel(
get(mpLBCapStyle, "linecapstyle");
const sal_uInt16 nIdColor = mpTBColor->GetItemId(UNO_SELECTCOLOR);
- mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_LINE_COLOR, nIdColor, mpTBColor)),
+ mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(0 /* not defined, default is transparent */, nIdColor, mpTBColor)),
Initialize();
}
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index f86821c..65563c0 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -48,7 +48,6 @@ using namespace ::com::sun::star::lang;
SFX_IMPL_TOOLBOX_CONTROL( SvxLineStyleToolBoxControl, XLineStyleItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxLineWidthToolBoxControl, XLineWidthItem );
-SFX_IMPL_TOOLBOX_CONTROL( SvxLineColorToolBoxControl, XLineColorItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxLineEndToolBoxControl, SfxBoolItem );
/*************************************************************************
@@ -262,84 +261,8 @@ Window* SvxLineWidthToolBoxControl::CreateItemWindow( Window *pParent )
return( new SvxMetricField( pParent, m_xFrame ) );
}
-/*************************************************************************
-|*
-|* SvxLineColorToolBoxControl
-|*
-\************************************************************************/
-
-SvxLineColorToolBoxControl::SvxLineColorToolBoxControl(
- sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
- SfxToolBoxControl( nSlotId, nId, rTbx )
-{
- addStatusListener( OUString( ".uno:ColorTableState" ));
-}
-
-
-
-SvxLineColorToolBoxControl::~SvxLineColorToolBoxControl()
-{
-}
-
-
-
-void SvxLineColorToolBoxControl::StateChanged(
-
- sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
-
-{
- SvxColorBox* pBox = (SvxColorBox*)GetToolBox().GetItemWindow( GetId() );
- DBG_ASSERT( pBox, "Window not found" );
-
- if ( nSID != SID_COLOR_TABLE )
- {
- if ( eState == SFX_ITEM_DISABLED )
- {
- pBox->Disable();
- pBox->SetNoSelection();
- }
- else
- {
- pBox->Enable();
-
- if ( eState == SFX_ITEM_AVAILABLE )
- {
- DBG_ASSERT( pState->ISA(XLineColorItem), "wrong ItemType" );
- pBox->Update( (const XLineColorItem*) pState );
- }
- else
- pBox->Update( NULL );
- }
- }
- else
- Update( pState );
-}
-
-void SvxLineColorToolBoxControl::Update( const SfxPoolItem* pState )
-{
- if ( pState && ( pState->ISA( SvxColorListItem ) ) )
- {
- SvxColorBox* pBox = (SvxColorBox*)GetToolBox().GetItemWindow( GetId() );
-
- DBG_ASSERT( pBox, "Window not found" );
-
- // The list of colors (ColorTable) has changed:
- ::Color aTmpColor( pBox->GetSelectEntryColor() );
- pBox->Clear();
- pBox->Fill( ( (SvxColorListItem*)pState )->GetColorList() );
- pBox->SelectEntry( aTmpColor );
- }
-}
-
-
-
-Window* SvxLineColorToolBoxControl::CreateItemWindow( Window *pParent )
-{
- return new SvxColorBox( pParent, m_aCommandURL, m_xFrame );
-}
-
/*************************************************************************
|*
|* SvxLineEndWindow
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 3bab63d..93c5981 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -87,6 +87,7 @@
#include <svx/tbxcolorupdate.hxx>
#include <editeng/eerdll.hxx>
#include <editeng/editrids.hrc>
+#include <svx/xlnclit.hxx>
@@ -115,6 +116,7 @@ using namespace ::com::sun::star::lang;
SFX_IMPL_TOOLBOX_CONTROL( SvxStyleToolBoxControl, SfxTemplateItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFontNameToolBoxControl, SvxFontItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxColorToolBoxControl, SvxColorItem );
+SFX_IMPL_TOOLBOX_CONTROL( SvxLineColorToolBoxControl, XLineColorItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFrameToolBoxControl, SvxBoxItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFrameLineStyleToolBoxControl, SvxLineItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxSimpleUndoRedoController, SfxStringItem );
@@ -1119,10 +1121,14 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
aColorSet.SetAccessibleName( SVX_RESSTR( RID_SVXSTR_TEXTCOLOR ) );
}
}
- else
+ else if ( SID_FRAME_LINECOLOR == theSlotId )
{
aColorSet.SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR ) );
}
+ else
+ {
+ aColorSet.SetAccessibleName( SVX_RESSTR( RID_SVXSTR_LINECOLOR ) );
+ }
if ( pColorList.is() )
{
@@ -1228,10 +1234,16 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
aColorSet.Clear();
aColorSet.addEntriesForXColorList(*pColorList);
}
- else if ((SFX_ITEM_DEFAULT <= eState ) && ( pState->ISA( SvxColorItem )))
+ else if ( SFX_ITEM_DEFAULT <= eState )
{
aColorSet.SetNoSelection();
- const Color rColor = ((const SvxColorItem*)pState)->GetValue();
+
+ Color rColor;
+ if ( pState->ISA( SvxColorItem ) )
+ rColor = ((const SvxColorItem*)pState)->GetValue();
+ else if ( pState->ISA( XLineColorItem ) )
+ rColor = ((const XLineColorItem*)pState)->GetColorValue();
+
for ( size_t i = 1; i < aColorSet.GetItemCount(); i++ )
{
if ( rColor == aColorSet.GetItemColor(i) )
@@ -2464,6 +2476,75 @@ void SvxColorToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
}
+// class SvxLineColorToolBoxControl ----------------------------------------
+
+SvxLineColorToolBoxControl::SvxLineColorToolBoxControl(
+ sal_uInt16 nSlotId,
+ sal_uInt16 nId,
+ ToolBox& rTbx ) :
+
+ SfxToolBoxControl( nSlotId, nId, rTbx ),
+ mLastColor( COL_BLACK )
+{
+ rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
+ addStatusListener( OUString( ".uno:XLineColor" ) );
+ pBtnUpdater.reset( new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ) );
+}
+
+SvxLineColorToolBoxControl::~SvxLineColorToolBoxControl()
+{
+}
+
+SfxPopupWindowType SvxLineColorToolBoxControl::GetPopupWindowType() const
+{
+ return SFX_POPUPWINDOW_ONTIMEOUT;
+}
+
+SfxPopupWindow* SvxLineColorToolBoxControl::CreatePopupWindow()
+{
+ SvxColorWindow_Impl* pColorWin =
+ new SvxColorWindow_Impl(
+ m_aCommandURL,
+ GetSlotId(),
+ m_xFrame,
+ SVX_RESSTR( RID_SVXSTR_LINECOLOR ),
+ &GetToolBox() );
+
+ pColorWin->StartPopupMode( &GetToolBox(),
+ FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
+ pColorWin->StartSelection();
+ SetPopupWindow( pColorWin );
+ pColorWin->SetSelectedHdl( LINK( this, SvxLineColorToolBoxControl, SelectedHdl ) );
+ return pColorWin;
+}
+
+IMPL_LINK(SvxLineColorToolBoxControl, SelectedHdl, Color*, pColor)
+{
+ pBtnUpdater->Update( *pColor );
+ mLastColor = *pColor;
+ return 0;
+}
+
+void SvxLineColorToolBoxControl::StateChanged(
+
+ sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* /*pState*/ )
+
+{
+ ToolBox& rTbx = GetToolBox();
+ sal_uInt16 nId = GetId();
+ rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
+ rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? TRISTATE_INDET : TRISTATE_FALSE );
+}
+
+void SvxLineColorToolBoxControl::Select(sal_uInt16 /*nSelectModifier*/)
+{
+ Sequence< PropertyValue > aArgs( 1 );
+ aArgs[0].Name = "XLineColor";
+ aArgs[0].Value = makeAny( (sal_uInt32)( mLastColor.GetColor() ));
+ Dispatch( OUString( ".uno:XLineColor" ), aArgs );
+}
+
+
// class SvxFrameToolBoxControl ------------------------------------------
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 94151bf..793eb76 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -71,6 +71,11 @@ String RID_SVXSTR_FRAME_COLOR
Text [ en-US ] = "Border Color" ;
};
+String RID_SVXSTR_LINECOLOR
+{
+ Text [ en-US ] = "Line Color" ;
+};
+
ComboBox RID_SVXTBX_STYLE
{
HelpId = HID_STYLE_LISTBOX ;
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 6f1b867..fc12a36 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -67,6 +67,9 @@ namespace svx
case SID_BACKGROUND_COLOR :
Update( COL_YELLOW );
break;
+ case SID_ATTR_LINE_COLOR:
+ Update( COL_BLACK );
+ break;
default :
Update( COL_TRANSPARENT );
}
diff --git a/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml b/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
index f9cfdd9..376a501 100644
--- a/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/drawingobjectbar.xml
@@ -25,7 +25,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatArea"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/sweb/toolbar/drawingobjectbar.xml b/sw/uiconfig/sweb/toolbar/drawingobjectbar.xml
index c87522f..71e2ad0 100644
--- a/sw/uiconfig/sweb/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/drawingobjectbar.xml
@@ -25,7 +25,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth" toolbar:helpid="10171"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:helpid="10172"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown" toolbar:helpid="10172"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatArea" toolbar:helpid="10142"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swform/toolbar/drawingobjectbar.xml b/sw/uiconfig/swform/toolbar/drawingobjectbar.xml
index f9cfdd9..376a501 100644
--- a/sw/uiconfig/swform/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/drawingobjectbar.xml
@@ -25,7 +25,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatArea"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swreport/toolbar/drawingobjectbar.xml b/sw/uiconfig/swreport/toolbar/drawingobjectbar.xml
index f9cfdd9..376a501 100644
--- a/sw/uiconfig/swreport/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/drawingobjectbar.xml
@@ -25,7 +25,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatArea"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
index f9cfdd9..376a501 100644
--- a/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/drawingobjectbar.xml
@@ -25,7 +25,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatArea"/>
<toolbar:toolbarseparator/>
diff --git a/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml b/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml
index f9cfdd9..376a501 100644
--- a/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/drawingobjectbar.xml
@@ -25,7 +25,7 @@
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:LineWidth"/>
<toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:XLineColor"/>
+ <toolbar:toolbaritem xlink:href=".uno:XLineColor" toolbar:style="dropdown"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:FormatArea"/>
<toolbar:toolbarseparator/>
commit 205801782d51861d9cee6fa342367af92bb1d845
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Fri May 16 11:45:17 2014 +0300
sd: Use correct SID instead of 0
Change-Id: I181519578b2984463ad20f4b028917bcb49ba4d0
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 40dcb4a..69ec0aa 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -217,7 +217,7 @@ void SdDLL::RegisterControllers()
SvxStyleToolBoxControl::RegisterControl(0, pMod);
SvxFontNameToolBoxControl::RegisterControl(0, pMod);
- SvxColorToolBoxControl::RegisterControl(0, pMod);
+ SvxColorToolBoxControl::RegisterControl( SID_ATTR_CHAR_COLOR, pMod );
SvxGrafFilterToolBoxControl::RegisterControl( SID_GRFFILTER, pMod );
SvxGrafModeToolBoxControl::RegisterControl( SID_ATTR_GRAF_MODE, pMod );
More information about the Libreoffice-commits
mailing list