sc/uiconfig/scalc/toolbar/graphicobjectbar.xml | 2 sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml | 1 sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml | 6 + sd/uiconfig/sdraw/toolbar/textobjectbar.xml | 1 sd/uiconfig/sdraw/toolbar/toolbar.xml | 7 - sd/uiconfig/simpress/toolbar/drawingobjectbar.xml | 1 sd/uiconfig/simpress/toolbar/graphicobjectbar.xml | 9 + sd/uiconfig/simpress/toolbar/textobjectbar.xml | 1 sd/uiconfig/simpress/toolbar/toolbar.xml | 10 - svtools/inc/svtools/ctrlbox.hxx | 18 --- svtools/inc/svtools/ctrltool.hxx | 5 svtools/inc/svtools/svtools.hrc | 4 svtools/source/control/ctrlbox.cxx | 112 +--------------------- svtools/source/control/ctrlbox.src | 18 --- svtools/source/control/ctrltool.cxx | 24 ---- svx/source/tbxctrls/tbcontrl.cxx | 1 sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml | 3 sw/uiconfig/sglobal/toolbar/numobjectbar.xml | 6 - sw/uiconfig/sglobal/toolbar/tableobjectbar.xml | 2 sw/uiconfig/sweb/toolbar/numobjectbar.xml | 6 - sw/uiconfig/sweb/toolbar/tableobjectbar.xml | 2 sw/uiconfig/swform/toolbar/graphicobjectbar.xml | 3 sw/uiconfig/swform/toolbar/numobjectbar.xml | 6 - sw/uiconfig/swform/toolbar/tableobjectbar.xml | 2 sw/uiconfig/swreport/toolbar/graphicobjectbar.xml | 3 sw/uiconfig/swreport/toolbar/numobjectbar.xml | 6 - sw/uiconfig/swreport/toolbar/tableobjectbar.xml | 2 sw/uiconfig/swriter/toolbar/graphicobjectbar.xml | 3 sw/uiconfig/swriter/toolbar/numobjectbar.xml | 6 - sw/uiconfig/swriter/toolbar/tableobjectbar.xml | 2 sw/uiconfig/swxform/toolbar/graphicobjectbar.xml | 3 sw/uiconfig/swxform/toolbar/numobjectbar.xml | 6 - sw/uiconfig/swxform/toolbar/tableobjectbar.xml | 2 33 files changed, 28 insertions(+), 255 deletions(-)
New commits: commit a4e2e50c4d6422fe49f345409b6f94cbc43d3d09 Author: Jan Holesovsky <[email protected]> Date: Wed Oct 17 16:04:28 2012 +0200 Remove the unneeded "scalable font" icon from the font combobox. Change-Id: Ifadad736ae39dff67ad7bc499f85bfbb484826ff diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx index 4411746..77962c3 100644 --- a/svtools/inc/svtools/ctrlbox.hxx +++ b/svtools/inc/svtools/ctrlbox.hxx @@ -42,11 +42,10 @@ class FontList; class ImplColorListData; class ImpLineListData; -class ImplFontNameListData; typedef ::std::vector< ImplColorListData* > ImpColorList; typedef ::std::vector< ImpLineListData* > ImpLineList; -typedef ::std::vector< ImplFontNameListData* > ImplFontList; +typedef ::std::vector< FontInfo > ImplFontList; // FIXME: STYLE_* duplicate values from editeng::SvxBorderStyle, // which in turn duplicates values from com::sun::star::table::BorderLineStyle: @@ -111,9 +110,7 @@ Erlaubt die Auswahl von Fonts. Die ListBox wird mit Fill gefuellt, wo ein Pointer auf eine FontList uebergeben werden muss. Mit EnableWYSIWYG() kann man einstellen, das die Fontnamen in Ihrer Schrift -angezeigt werden und mit EnableSymbols() kann eingestellt werden, das -vor dem Namen ueber ein Symbol angezeigt wird, ob es sich um eine -Drucker oder Bildschirmschrift handelt. +angezeigt werden. Querverweise @@ -433,21 +430,15 @@ class SVT_DLLPUBLIC FontNameBox : public ComboBox { private: ImplFontList* mpFontList; - Image maImagePrinterFont; - Image maImageBitmapFont; - Image maImageScalableFont; sal_Bool mbWYSIWYG; - sal_Bool mbSymbols; - String maFontMRUEntriesFile; + String maFontMRUEntriesFile; #ifdef _CTRLBOX_CXX SVT_DLLPRIVATE void ImplCalcUserItemSize(); SVT_DLLPRIVATE void ImplDestroyFontList(); #endif - void InitBitmaps( void ); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); void LoadMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode cSep = ';' ); void SaveMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode cSep = ';' ) const; public: @@ -463,9 +454,6 @@ public: void EnableWYSIWYG( sal_Bool bEnable = sal_True ); sal_Bool IsWYSIWYGEnabled() const { return mbWYSIWYG; } - void EnableSymbols( sal_Bool bEnable = sal_True ); - sal_Bool IsSymbolsEnabled() const { return mbSymbols; } - private: void InitFontMRUEntriesFile(); diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx index 837c29d..0ee133b 100644 --- a/svtools/inc/svtools/ctrltool.hxx +++ b/svtools/inc/svtools/ctrltool.hxx @@ -140,10 +140,6 @@ von der FontList, sollte deshalb das Array nicht mehr referenziert werden. #define FONTLIST_FONTINFO_NOTFOUND ((sal_uInt16)0xFFFF) -#define FONTLIST_FONTNAMETYPE_PRINTER ((sal_uInt16)0x0001) -#define FONTLIST_FONTNAMETYPE_SCREEN ((sal_uInt16)0x0002) -#define FONTLIST_FONTNAMETYPE_SCALABLE ((sal_uInt16)0x0004) - class SVT_DLLPUBLIC FontList { private: @@ -202,7 +198,6 @@ public: return (sal_uInt16)maEntries.size(); } const FontInfo& GetFontName( sal_uInt16 nFont ) const; - sal_uInt16 GetFontNameType( sal_uInt16 nFont ) const; sal_Handle GetFirstFontInfo( const OUString& rName ) const; sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const; const FontInfo& GetFontInfo( sal_Handle hFontInfo ) const; diff --git a/svtools/inc/svtools/svtools.hrc b/svtools/inc/svtools/svtools.hrc index 6988e19..6b17f62 100644 --- a/svtools/inc/svtools/svtools.hrc +++ b/svtools/inc/svtools/svtools.hrc @@ -262,10 +262,6 @@ #define RID_IMG_TREENODE_COLLAPSED (RID_SVTOOLS_START + 0) #define RID_IMG_TREENODE_EXPANDED (RID_SVTOOLS_START + 1) -#define RID_IMG_PRINTERFONT (RID_SVTOOLS_START + 12) -#define RID_IMG_BITMAPFONT (RID_SVTOOLS_START + 13) -#define RID_IMG_SCALABLEFONT (RID_SVTOOLS_START + 14) - #define IMG_TRIANGLE_RIGHT (RID_SVTOOLS_START + 18) #define IMG_TRIANGLE_DOWN (RID_SVTOOLS_START + 20) diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 1e0856f..b3a095d 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -58,7 +58,6 @@ #include <stdio.h> -#define IMGINNERTEXTSPACE 2 #define IMGOUTERTEXTSPACE 5 #define EXTRAFONTSIZE 5 #define GAPTOEXTRAPREVIEW 10 @@ -1024,28 +1023,11 @@ void LineListBox::DataChanged( const DataChangedEvent& rDCEvt ) // FontNameBox // =================================================================== -class ImplFontNameListData -{ -public: - FontInfo maInfo; - sal_uInt16 mnType; - - ImplFontNameListData( const FontInfo& rInfo, - sal_uInt16 nType ) : - maInfo( rInfo ), - mnType( nType ) - {} -}; - -// ------------------------------------------------------------------- - FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { - InitBitmaps(); mpFontList = NULL; mbWYSIWYG = sal_False; - mbSymbols = sal_False; InitFontMRUEntriesFile(); } @@ -1054,10 +1036,8 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) : FontNameBox::FontNameBox( Window* pParent, const ResId& rResId ) : ComboBox( pParent, rResId ) { - InitBitmaps(); mpFontList = NULL; mbWYSIWYG = sal_False; - mbSymbols = sal_False; InitFontMRUEntriesFile(); } @@ -1083,16 +1063,6 @@ FontNameBox::~FontNameBox() // ------------------------------------------------------------------- -void FontNameBox::DataChanged( const DataChangedEvent& rDCEvt ) -{ - ComboBox::DataChanged( rDCEvt ); - - if( rDCEvt.GetType() == DATACHANGED_SETTINGS && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - InitBitmaps(); -} - -// ------------------------------------------------------------------- - void FontNameBox::SaveMRUEntries( const String& aFontMRUEntriesFile, xub_Unicode cSep ) const { rtl::OString aEntries(rtl::OUStringToOString(GetMRUEntries(cSep), @@ -1155,25 +1125,9 @@ void FontNameBox::InitFontMRUEntriesFile() // ------------------------------------------------------------------- -void FontNameBox::InitBitmaps( void ) -{ - maImagePrinterFont = Image( SvtResId( RID_IMG_PRINTERFONT ) ); - maImageBitmapFont = Image( SvtResId( RID_IMG_BITMAPFONT ) ); - maImageScalableFont = Image( SvtResId( RID_IMG_SCALABLEFONT ) ); -} - -// ------------------------------------------------------------------- - void FontNameBox::ImplDestroyFontList() { - if ( mpFontList ) - { - for ( size_t i = 0, n = mpFontList->size(); i < n; ++i ) { - delete (*mpFontList)[ i ]; - } - mpFontList->clear(); - delete mpFontList; - } + delete mpFontList; } // ------------------------------------------------------------------- @@ -1197,14 +1151,12 @@ void FontNameBox::Fill( const FontList* pList ) sal_uLong nIndex = InsertEntry( rFontInfo.GetName() ); if ( nIndex != LISTBOX_ERROR ) { - sal_uInt16 nType = pList->GetFontNameType( i ); - ImplFontNameListData* pData = new ImplFontNameListData( rFontInfo, nType ); if ( nIndex < mpFontList->size() ) { ImplFontList::iterator it = mpFontList->begin(); ::std::advance( it, nIndex ); - mpFontList->insert( it, pData ); + mpFontList->insert( it, rFontInfo ); } else { - mpFontList->push_back( pData ); + mpFontList->push_back( rFontInfo ); } } } @@ -1228,19 +1180,7 @@ void FontNameBox::EnableWYSIWYG( sal_Bool bEnable ) if ( bEnable != mbWYSIWYG ) { mbWYSIWYG = bEnable; - EnableUserDraw( mbWYSIWYG | mbSymbols ); - ImplCalcUserItemSize(); - } -} - -// ------------------------------------------------------------------- - -void FontNameBox::EnableSymbols( sal_Bool bEnable ) -{ - if ( bEnable != mbSymbols ) - { - mbSymbols = bEnable; - EnableUserDraw( mbWYSIWYG | mbSymbols ); + EnableUserDraw( mbWYSIWYG ); ImplCalcUserItemSize(); } } @@ -1256,17 +1196,6 @@ void FontNameBox::ImplCalcUserItemSize() aUserItemSz.Height() *= 16; aUserItemSz.Height() /= 10; } - if ( mbSymbols ) - { - Size aSz = maImageScalableFont.GetSizePixel(); - aUserItemSz.Width() += aSz.Width() + IMGINNERTEXTSPACE; - - if ( mbWYSIWYG && mpFontList ) - aUserItemSz.Width() += IMGOUTERTEXTSPACE; - - if ( aSz.Height() > aUserItemSz.Height() ) - aUserItemSz.Height() = aSz.Height(); - } SetUserItemSize( aUserItemSz ); } @@ -1302,35 +1231,14 @@ namespace void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt ) { - ImplFontNameListData* pData = (*mpFontList)[ rUDEvt.GetItemId() ]; - const FontInfo& rInfo = pData->maInfo; - sal_uInt16 nType = pData->mnType; - Point aTopLeft = rUDEvt.GetRect().TopLeft(); - long nX = aTopLeft.X(); - long nH = rUDEvt.GetRect().GetHeight(); - - if ( mbSymbols ) - { - nX += IMGINNERTEXTSPACE; - Image* pImg = NULL; - if ( (nType & (FONTLIST_FONTNAMETYPE_PRINTER | FONTLIST_FONTNAMETYPE_SCREEN)) == FONTLIST_FONTNAMETYPE_PRINTER ) - pImg = &maImagePrinterFont; - else if ( nType & FONTLIST_FONTNAMETYPE_SCALABLE ) - pImg = &maImageScalableFont; - else - pImg = &maImageBitmapFont; + assert( mpFontList ); - if ( pImg ) - { - Point aPos( nX, aTopLeft.Y() + (nH-pImg->GetSizePixel().Height())/2 ); - rUDEvt.GetDevice()->DrawImage( aPos, *pImg ); - } + FontInfo& rInfo = (*mpFontList)[ rUDEvt.GetItemId() ]; + Point aTopLeft = rUDEvt.GetRect().TopLeft(); + long nX = aTopLeft.X(); + long nH = rUDEvt.GetRect().GetHeight(); - // X immer um gleiche Breite aendern, auch wenn kein Image ausgegeben. - nX += maImagePrinterFont.GetSizePixel().Width(); - } - - if ( mbWYSIWYG && mpFontList ) + if ( mbWYSIWYG ) { nX += IMGOUTERTEXTSPACE; diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src index b31c875..e1abf12 100644 --- a/svtools/source/control/ctrlbox.src +++ b/svtools/source/control/ctrlbox.src @@ -31,24 +31,6 @@ #endif -IMAGE RID_IMG_SCALABLEFONT -{ - ImageBitmap = Bitmap { File = "scalfont.png" ; }; - MaskColor = IMAGE_STDBTN_COLOR ; -}; - -IMAGE RID_IMG_PRINTERFONT -{ - ImageBitmap = Bitmap { File = "prnfont.png" ; }; - MaskColor = IMAGE_STDBTN_COLOR ; -}; - -IMAGE RID_IMG_BITMAPFONT -{ - ImageBitmap = Bitmap { File = "bmpfont.png" ; }; - MaskColor = IMAGE_STDBTN_COLOR ; -}; - String STR_SVT_AUTOMATIC_COLOR { Text [ en-US ] = "Automatic"; diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 44da6fc..f18f865 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -116,7 +116,6 @@ class ImplFontListNameInfo private: XubString maSearchName; ImplFontListFontInfo* mpFirst; - sal_uInt16 mnType; ImplFontListNameInfo( const XubString& rSearchName ) : maSearchName( rSearchName ) @@ -262,12 +261,6 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll, { rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding(); - sal_uInt16 nType; - if ( pDevice->GetOutDevType() != OUTDEV_PRINTER ) - nType = FONTLIST_FONTNAMETYPE_SCREEN; - else - nType = FONTLIST_FONTNAMETYPE_PRINTER; - // Alle Fonts vom Device abfragen int n = pDevice->GetDevFontCount(); sal_uInt16 i; @@ -294,7 +287,6 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll, pData = new ImplFontListNameInfo( aSearchName ); pData->mpFirst = pNewInfo; pNewInfo->mpNext = NULL; - pData->mnType = 0; if (nIndex < maEntries.size()) maEntries.insert(maEntries.begin()+nIndex,pData); @@ -347,13 +339,6 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll, } } } - - if ( pData ) - { - pData->mnType |= nType; - if ( aFontInfo.GetType() != TYPE_RASTER ) - pData->mnType |= FONTLIST_FONTNAMETYPE_SCALABLE; - } } } @@ -681,15 +666,6 @@ const FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const // ----------------------------------------------------------------------- -sal_uInt16 FontList::GetFontNameType( sal_uInt16 nFont ) const -{ - DBG_ASSERT( nFont < GetFontNameCount(), "FontList::GetFontNameType(): nFont >= Count" ); - - return maEntries[nFont].mnType; -} - -// ----------------------------------------------------------------------- - sal_Handle FontList::GetFirstFontInfo(const OUString& rName) const { ImplFontListNameInfo* pData = ImplFindByName( rName ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 8119276..57ac134 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -747,7 +747,6 @@ void SvxFontNameBox_Impl::EnableControls_Impl() bEnable = aFontOpt.IsFontWYSIWYGEnabled(); EnableWYSIWYG( bEnable ); - EnableSymbols( bEnable ); } // ----------------------------------------------------------------------- commit a12db69b78f9a3c681b5332ec64585cea5ade8ca Author: Jan Holesovsky <[email protected]> Date: Tue Oct 16 13:16:03 2012 +0200 Calc, Writer toolbars: Remove Insert Graphics from the Graphics toolbars. Based on discussions with Mirek M., thanks! :-) Change-Id: Ic3550d9d2c7e161cc0d1ababcd11b910d5c19d8e diff --git a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml index 25eca79..d041e0c 100644 --- a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="helpid:10469" toolbar:style="dropdown" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="helpid:10871" /> diff --git a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml index 040bb8c..aa9017d 100644 --- a/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="10469"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/> @@ -15,4 +13,4 @@ <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/swform/toolbar/graphicobjectbar.xml b/sw/uiconfig/swform/toolbar/graphicobjectbar.xml index 040bb8c..aa9017d 100644 --- a/sw/uiconfig/swform/toolbar/graphicobjectbar.xml +++ b/sw/uiconfig/swform/toolbar/graphicobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="10469"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/> @@ -15,4 +13,4 @@ <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml b/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml index 040bb8c..aa9017d 100644 --- a/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml +++ b/sw/uiconfig/swreport/toolbar/graphicobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="10469"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/> @@ -15,4 +13,4 @@ <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml index 040bb8c..aa9017d 100644 --- a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="10469"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/> @@ -15,4 +13,4 @@ <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml index 040bb8c..aa9017d 100644 --- a/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml +++ b/sw/uiconfig/swxform/toolbar/graphicobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GraphicFilterToolbox" toolbar:helpid="10469"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:GrafMode" toolbar:helpid="10871"/> @@ -15,4 +13,4 @@ <toolbar:toolbaritem xlink:href=".uno:FlipHorizontal" toolbar:helpid="20425"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FrameDialog" toolbar:helpid="20458"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> commit f6a784a99dc8d8f06c4517de9f6387df55092dc4 Author: Jan Holesovsky <[email protected]> Date: Tue Oct 16 12:56:16 2012 +0200 Writer toolbars: Remove Insert Table from the Table toolbar. Based on discussions with Mirek M., thansk! :-) Change-Id: If233bd9a6ad12682f83bfdef5724a29e360df0a7 diff --git a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml index 231431f..dac2193 100644 --- a/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" /> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" /> <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" /> <toolbar:toolbarseparator/> diff --git a/sw/uiconfig/sweb/toolbar/tableobjectbar.xml b/sw/uiconfig/sweb/toolbar/tableobjectbar.xml index bce574f..b6b5cfd 100644 --- a/sw/uiconfig/sweb/toolbar/tableobjectbar.xml +++ b/sw/uiconfig/sweb/toolbar/tableobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" /> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" /> <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" /> <toolbar:toolbarseparator/> diff --git a/sw/uiconfig/swform/toolbar/tableobjectbar.xml b/sw/uiconfig/swform/toolbar/tableobjectbar.xml index d34267a..0d828f5 100644 --- a/sw/uiconfig/swform/toolbar/tableobjectbar.xml +++ b/sw/uiconfig/swform/toolbar/tableobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" /> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" /> <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" /> <toolbar:toolbarseparator/> diff --git a/sw/uiconfig/swreport/toolbar/tableobjectbar.xml b/sw/uiconfig/swreport/toolbar/tableobjectbar.xml index d34267a..0d828f5 100644 --- a/sw/uiconfig/swreport/toolbar/tableobjectbar.xml +++ b/sw/uiconfig/swreport/toolbar/tableobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" /> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" /> <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" /> <toolbar:toolbarseparator/> diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml index d34267a..0d828f5 100644 --- a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" /> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" /> <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" /> <toolbar:toolbarseparator/> diff --git a/sw/uiconfig/swxform/toolbar/tableobjectbar.xml b/sw/uiconfig/swxform/toolbar/tableobjectbar.xml index d34267a..0d828f5 100644 --- a/sw/uiconfig/swxform/toolbar/tableobjectbar.xml +++ b/sw/uiconfig/swxform/toolbar/tableobjectbar.xml @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar"> - <toolbar:toolbaritem xlink:href=".uno:InsertTable" toolbar:helpid="helpid:20330" /> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:LineStyle" toolbar:helpid="helpid:10200" /> <toolbar:toolbaritem xlink:href=".uno:FrameLineColor" toolbar:helpid="helpid:10201" /> <toolbar:toolbarseparator/> commit 8d58aca88cdcb48de2006aece446cc1655bd0815 Author: Jan Holesovsky <[email protected]> Date: Tue Oct 16 12:50:56 2012 +0200 Writer toolbars: Remove Numbering on/off from the Numbering toolbars. Based on discussions with Mirek M., thanks! :-) Change-Id: Ifbd4eb9c9d7d314809f2000dfb572fa6eae2b198 diff --git a/sw/uiconfig/sglobal/toolbar/numobjectbar.xml b/sw/uiconfig/sglobal/toolbar/numobjectbar.xml index 50e28ac..4d4b31c 100644 --- a/sw/uiconfig/sglobal/toolbar/numobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/numobjectbar.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/> - <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/> <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/> <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/> @@ -20,4 +15,4 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/> <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/sweb/toolbar/numobjectbar.xml b/sw/uiconfig/sweb/toolbar/numobjectbar.xml index 50e28ac..4d4b31c 100644 --- a/sw/uiconfig/sweb/toolbar/numobjectbar.xml +++ b/sw/uiconfig/sweb/toolbar/numobjectbar.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/> - <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/> <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/> <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/> @@ -20,4 +15,4 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/> <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/swform/toolbar/numobjectbar.xml b/sw/uiconfig/swform/toolbar/numobjectbar.xml index 50e28ac..4d4b31c 100644 --- a/sw/uiconfig/swform/toolbar/numobjectbar.xml +++ b/sw/uiconfig/swform/toolbar/numobjectbar.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/> - <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/> <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/> <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/> @@ -20,4 +15,4 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/> <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/swreport/toolbar/numobjectbar.xml b/sw/uiconfig/swreport/toolbar/numobjectbar.xml index 50e28ac..4d4b31c 100644 --- a/sw/uiconfig/swreport/toolbar/numobjectbar.xml +++ b/sw/uiconfig/swreport/toolbar/numobjectbar.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/> - <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/> <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/> <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/> @@ -20,4 +15,4 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/> <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/numobjectbar.xml b/sw/uiconfig/swriter/toolbar/numobjectbar.xml index 50e28ac..4d4b31c 100644 --- a/sw/uiconfig/swriter/toolbar/numobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/numobjectbar.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/> - <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/> <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/> <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/> @@ -20,4 +15,4 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/> <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/swxform/toolbar/numobjectbar.xml b/sw/uiconfig/swxform/toolbar/numobjectbar.xml index 50e28ac..4d4b31c 100644 --- a/sw/uiconfig/swxform/toolbar/numobjectbar.xml +++ b/sw/uiconfig/swxform/toolbar/numobjectbar.xml @@ -1,11 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE toolbar:toolbar PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "toolbar.dtd"> <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink";> - <toolbar:toolbaritem xlink:href=".uno:DefaultBullet" toolbar:helpid="20138"/> - <toolbar:toolbaritem xlink:href=".uno:DefaultNumbering" toolbar:helpid="20144"/> - <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:RemoveBullets" toolbar:helpid="20137"/> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:IncrementLevel" toolbar:helpid="20131"/> <toolbar:toolbaritem xlink:href=".uno:DecrementLevel" toolbar:helpid="20130"/> <toolbar:toolbaritem xlink:href=".uno:IncrementSubLevels" toolbar:helpid="20140"/> @@ -20,4 +15,4 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:NumberingStart" toolbar:helpid="21738"/> <toolbar:toolbaritem xlink:href=".uno:BulletsAndNumberingDialog" toolbar:helpid="20121"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> commit 0154ab1a650e3713d1799c4cca595230cf065333 Author: Jan Holesovsky <[email protected]> Date: Tue Oct 16 11:28:51 2012 +0200 Impress, Draw toolbars: Move alignment etc. away from "Drawing". Based on discussions with Mirek M., thanks! :-) Change-Id: Ib295629cb5e35835e1087bf048947d9a3e3323f9 diff --git a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml index 4c322a9..fb3a2f9 100644 --- a/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml @@ -18,4 +18,10 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="10299"/> <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:visible="false" toolbar:helpid="10371"/> -</toolbar:toolbar> \ No newline at end of file + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:helpid="helpid:27095" toolbar:style="radio dropdown" /> + <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:helpid="helpid:27085" toolbar:visible="false" /> + <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" toolbar:visible="false" /> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" /> + <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:helpid="helpid:27022" toolbar:style="dropdown" /> +</toolbar:toolbar> diff --git a/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml index 43956d0..ac6b05b 100644 --- a/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml @@ -14,4 +14,10 @@ <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="helpid:10299" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Crop" toolbar:helpid="helpid:10883" /> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:helpid="helpid:27095" toolbar:style="radio dropdown" /> + <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:helpid="helpid:27085" toolbar:visible="false" /> + <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" toolbar:visible="false" /> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" /> + <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:helpid="helpid:27022" toolbar:style="dropdown" /> </toolbar:toolbar> diff --git a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml index d364ca4..e18ac8c 100644 --- a/sd/uiconfig/sdraw/toolbar/textobjectbar.xml +++ b/sd/uiconfig/sdraw/toolbar/textobjectbar.xml @@ -37,4 +37,4 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/> <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:visible="false" toolbar:helpid="27019"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sd/uiconfig/sdraw/toolbar/toolbar.xml b/sd/uiconfig/sdraw/toolbar/toolbar.xml index 9bd8025..f460058 100644 --- a/sd/uiconfig/sdraw/toolbar/toolbar.xml +++ b/sd/uiconfig/sdraw/toolbar/toolbar.xml @@ -32,14 +32,8 @@ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241" /> <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="helpid:5960" /> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:AdvancedMode" toolbar:helpid="helpid:27095" toolbar:style="radio dropdown" /> - <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:helpid="helpid:27085" toolbar:visible="false" /> - <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" toolbar:visible="false" /> - <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" /> - <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:helpid="helpid:27022" toolbar:style="dropdown" /> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:helpid="helpid:27318" toolbar:style="radio dropdown" toolbar:visible="false" /> <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:helpid="helpid:10593" toolbar:style="dropdown" toolbar:visible="false" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml index 4c322a9..512b135 100644 --- a/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml @@ -18,4 +18,14 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="10299"/> <toolbar:toolbaritem xlink:href=".uno:ImageMapDialog" toolbar:visible="false" toolbar:helpid="10371"/> -</toolbar:toolbar> \ No newline at end of file + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="helpid:10129" toolbar:style="radio" /> + <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" toolbar:visible="false" /> + <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:helpid="helpid:27085" toolbar:visible="false" /> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" /> + <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:helpid="helpid:27022" toolbar:style="dropdown" /> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:CustomAnimation" toolbar:helpid="helpid:27328" toolbar:style="auto" toolbar:visible="false" /> + <toolbar:toolbaritem xlink:href=".uno:AnimationEffects" toolbar:helpid="helpid:27063" /> + <toolbar:toolbaritem xlink:href=".uno:Window3D" toolbar:helpid="helpid:10644" toolbar:style="auto" toolbar:visible="false" /> +</toolbar:toolbar> diff --git a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml index 93312f0..23f6a44 100644 --- a/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml @@ -14,4 +14,13 @@ <toolbar:toolbaritem xlink:href=".uno:FillShadow" toolbar:helpid="helpid:10299" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Crop" toolbar:helpid="helpid:10883" /> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="helpid:10129" toolbar:style="radio" /> + <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" toolbar:visible="false" /> + <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:helpid="helpid:27085" toolbar:visible="false" /> + <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" /> + <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:helpid="helpid:27022" toolbar:style="dropdown" /> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:CustomAnimation" toolbar:helpid="helpid:27328" toolbar:style="auto" toolbar:visible="false" /> + <toolbar:toolbaritem xlink:href=".uno:AnimationEffects" toolbar:helpid="helpid:27063" /> </toolbar:toolbar> diff --git a/sd/uiconfig/simpress/toolbar/textobjectbar.xml b/sd/uiconfig/simpress/toolbar/textobjectbar.xml index f91767c..ca988b2 100644 --- a/sd/uiconfig/simpress/toolbar/textobjectbar.xml +++ b/sd/uiconfig/simpress/toolbar/textobjectbar.xml @@ -42,4 +42,4 @@ <toolbar:toolbaritem xlink:href=".uno:InsertSymbol" toolbar:visible="false" toolbar:helpid="27019"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:Color" toolbar:helpid="10017"/> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> diff --git a/sd/uiconfig/simpress/toolbar/toolbar.xml b/sd/uiconfig/simpress/toolbar/toolbar.xml index 25bffb7..eb053f3 100644 --- a/sd/uiconfig/simpress/toolbar/toolbar.xml +++ b/sd/uiconfig/simpress/toolbar/toolbar.xml @@ -32,18 +32,9 @@ <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="helpid:10241" /> <toolbar:toolbaritem xlink:href=".uno:Gallery" toolbar:helpid="helpid:5960" /> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode" toolbar:helpid="helpid:10129" toolbar:style="radio" /> - <toolbar:toolbaritem xlink:href=".uno:TransformDialog" toolbar:helpid="helpid:10087" toolbar:visible="false" /> - <toolbar:toolbaritem xlink:href=".uno:Mirror" toolbar:helpid="helpid:27085" toolbar:visible="false" /> - <toolbar:toolbaritem xlink:href=".uno:ObjectAlign" toolbar:helpid="helpid:10130" toolbar:style="dropdown" /> - <toolbar:toolbaritem xlink:href=".uno:ObjectPosition" toolbar:helpid="helpid:27022" toolbar:style="dropdown" /> - <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:InsertToolbox" toolbar:helpid="helpid:27318" toolbar:style="radio dropdown" toolbar:visible="false" /> <toolbar:toolbaritem xlink:href=".uno:Config" toolbar:helpid="helpid:10593" toolbar:style="dropdown" toolbar:visible="false" /> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/> - <toolbar:toolbaritem xlink:href=".uno:CustomAnimation" toolbar:helpid="helpid:27328" toolbar:style="auto" toolbar:visible="false" /> - <toolbar:toolbaritem xlink:href=".uno:AnimationEffects" toolbar:helpid="helpid:27063" /> <toolbar:toolbaritem xlink:href=".uno:AnimationObjects" toolbar:helpid="helpid:27062" toolbar:style="auto" toolbar:visible="false" /> - <toolbar:toolbaritem xlink:href=".uno:Window3D" toolbar:helpid="helpid:10644" toolbar:style="auto" toolbar:visible="false" /> -</toolbar:toolbar> \ No newline at end of file +</toolbar:toolbar> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
