This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 5220934 Fixed mixed style (space/tabs) in indentation
5220934 is described below
commit 52209341d700b00d3f488e3eae4998db430c0556
Author: mseidel <[email protected]>
AuthorDate: Wed Sep 15 20:30:33 2021 +0200
Fixed mixed style (space/tabs) in indentation
(cherry picked from commit e03893213648da4b73a2d2a4b4f7916848252ff7)
---
.../source/fwe/xml/eventsconfiguration.cxx | 9 +-
.../source/fwe/xml/eventsdocumenthandler.cxx | 27 +-
.../framework/source/fwe/xml/menuconfiguration.cxx | 23 +-
.../source/fwe/xml/menudocumenthandler.cxx | 647 ++++++++++-----------
.../source/fwe/xml/saxnamespacefilter.cxx | 21 +-
.../source/fwe/xml/statusbarconfiguration.cxx | 26 +-
.../source/fwe/xml/statusbardocumenthandler.cxx | 229 ++++----
.../source/fwe/xml/toolboxconfiguration.cxx | 10 +-
.../source/fwe/xml/toolboxdocumenthandler.cxx | 531 +++++++++--------
.../fwe/xml/toolboxlayoutdocumenthandler.cxx | 8 +-
main/framework/source/fwe/xml/xmlnamespaces.cxx | 9 +-
11 files changed, 764 insertions(+), 776 deletions(-)
diff --git a/main/framework/source/fwe/xml/eventsconfiguration.cxx
b/main/framework/source/fwe/xml/eventsconfiguration.cxx
index c630983..9b03b2a 100644
--- a/main/framework/source/fwe/xml/eventsconfiguration.cxx
+++ b/main/framework/source/fwe/xml/eventsconfiguration.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -158,4 +158,3 @@ sal_Bool EventsConfiguration::StoreEventsConfig(
}
}
-
diff --git a/main/framework/source/fwe/xml/eventsdocumenthandler.cxx
b/main/framework/source/fwe/xml/eventsdocumenthandler.cxx
index f138558..514b4ab 100644
--- a/main/framework/source/fwe/xml/eventsdocumenthandler.cxx
+++ b/main/framework/source/fwe/xml/eventsdocumenthandler.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -228,7 +228,7 @@ throw( SAXException, RuntimeException )
long
nPropCount = 2; // every event config entry needs at least 2 properties
Sequence< PropertyValue > aEventProperties(
nPropCount );
- m_aEventItems.aEventNames.realloc( nIndex + 1
);
+ m_aEventItems.aEventNames.realloc( nIndex + 1 );
for ( sal_Int16 n = 0; n <
xAttribs->getLength(); n++ )
{
@@ -267,8 +267,8 @@ throw( SAXException, RuntimeException )
}
break;
- default:
- break; // nothing to do
+ default:
+ break;
// nothing to do
}
}
} // for
@@ -327,8 +327,8 @@ throw( SAXException, RuntimeException )
}
break;
- default:
- break;
+ default:
+ break;
}
}
}
@@ -369,8 +369,8 @@ throw( SAXException, RuntimeException )
}
break;
- default:
- break; // impossible case
+ default:
+ break; // impossible case
}
}
}
@@ -423,11 +423,11 @@ throw( SAXException, RuntimeException )
OWriteEventsDocumentHandler::OWriteEventsDocumentHandler(
const EventsConfig& aItems,
Reference< XDocumentHandler > rWriteDocumentHandler ) :
- ThreadHelpBase( &Application::GetSolarMutex() ),
+ ThreadHelpBase( &Application::GetSolarMutex() ),
m_aItems( aItems ),
m_xWriteDocumentHandler( rWriteDocumentHandler )
{
- ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
+ ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
m_xEmptyList = Reference< XAttributeList >( (XAttributeList
*) pList, UNO_QUERY );
m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
ATTRIBUTE_TYPE_CDATA ));
m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
XMLNS_XLINK_PREFIX ));
@@ -546,4 +546,3 @@ void OWriteEventsDocumentHandler::WriteEvent( const
::rtl::OUString& aEventName,
}
} // namespace framework
-
diff --git a/main/framework/source/fwe/xml/menuconfiguration.cxx
b/main/framework/source/fwe/xml/menuconfiguration.cxx
index bf01ec9..4089dd6 100644
--- a/main/framework/source/fwe/xml/menuconfiguration.cxx
+++ b/main/framework/source/fwe/xml/menuconfiguration.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -64,12 +64,12 @@ namespace framework
sal_Bool MenuConfiguration::IsPickListItemId( sal_uInt16 nId )
{
- return (( START_ITEMID_PICKLIST <= nId ) && ( nId <= END_ITEMID_PICKLIST
));
+ return (( START_ITEMID_PICKLIST <= nId ) && ( nId <=
END_ITEMID_PICKLIST ));
}
sal_Bool MenuConfiguration::IsWindowListItemId( sal_uInt16 nId )
{
- return (( START_ITEMID_WINDOWLIST <= nId ) && ( nId <=
END_ITEMID_WINDOWLIST ));
+ return (( START_ITEMID_WINDOWLIST <= nId ) && ( nId <=
END_ITEMID_WINDOWLIST ));
}
@@ -86,7 +86,7 @@ MenuConfiguration::~MenuConfiguration()
Reference< XIndexAccess > MenuConfiguration::CreateMenuBarConfigurationFromXML(
- Reference< XInputStream >& rInputStream )
+ Reference< XInputStream >& rInputStream )
throw ( WrappedTargetException )
{
Reference< XParser > xParser(
m_rxServiceManager->createInstance(SERVICENAME_SAXPARSER),UNO_QUERY);
@@ -98,7 +98,7 @@ throw ( WrappedTargetException )
// create menu bar
- Reference< XIndexContainer > xItemContainer( static_cast<
cppu::OWeakObject *>( new RootItemContainer()), UNO_QUERY );
+ Reference< XIndexContainer > xItemContainer( static_cast<
cppu::OWeakObject *>( new RootItemContainer()), UNO_QUERY );
// create namespace filter and set menudocument handler inside to
support xml namespaces
@@ -148,8 +148,8 @@ throw ( ::com::sun::star::lang::WrappedTargetException )
}
void MenuConfiguration::StoreMenuBarConfigurationToXML(
- Reference< XIndexAccess >& rMenuBarConfiguration,
- Reference< XOutputStream >& rOutputStream )
+ Reference< XIndexAccess >& rMenuBarConfiguration,
+ Reference< XOutputStream >& rOutputStream )
throw ( WrappedTargetException )
{
Reference< XDocumentHandler > xWriter;
@@ -162,7 +162,7 @@ throw ( WrappedTargetException )
try
{
- OWriteMenuDocumentHandler aWriteMenuDocumentHandler(
rMenuBarConfiguration, xWriter );
+ OWriteMenuDocumentHandler aWriteMenuDocumentHandler(
rMenuBarConfiguration, xWriter );
aWriteMenuDocumentHandler.WriteMenuDocument();
}
catch ( RuntimeException& e )
@@ -180,4 +180,3 @@ throw ( WrappedTargetException )
}
}
-
diff --git a/main/framework/source/fwe/xml/menudocumenthandler.cxx
b/main/framework/source/fwe/xml/menudocumenthandler.cxx
index 326198a..0828f96 100644
--- a/main/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/main/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -55,14 +55,14 @@
// defines
//_________________________________________________________________________________________________________________
-#define XMLNS_MENU
"http://openoffice.org/2001/menu";
-#define XMLNS_PREFIX "menu:"
+#define XMLNS_MENU
"http://openoffice.org/2001/menu";
+#define XMLNS_PREFIX "menu:"
-#define ELEMENT_MENUBAR
"http://openoffice.org/2001/menu^menubar";
-#define ELEMENT_MENU
"http://openoffice.org/2001/menu^menu";
-#define ELEMENT_MENUPOPUP
"http://openoffice.org/2001/menu^menupopup";
-#define ELEMENT_MENUITEM
"http://openoffice.org/2001/menu^menuitem";
-#define ELEMENT_MENUSEPARATOR
"http://openoffice.org/2001/menu^menuseparator";
+#define ELEMENT_MENUBAR
"http://openoffice.org/2001/menu^menubar";
+#define ELEMENT_MENU
"http://openoffice.org/2001/menu^menu";
+#define ELEMENT_MENUPOPUP
"http://openoffice.org/2001/menu^menupopup";
+#define ELEMENT_MENUITEM
"http://openoffice.org/2001/menu^menuitem";
+#define ELEMENT_MENUSEPARATOR
"http://openoffice.org/2001/menu^menuseparator";
#define ELEMENT_NS_MENUBAR "menu:menubar"
#define ELEMENT_NS_MENU "menu:menu"
@@ -70,43 +70,43 @@
#define ELEMENT_NS_MENUITEM "menu:menuitem"
#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator"
-#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id";
-#define ATTRIBUTE_LABEL
"http://openoffice.org/2001/menu^label";
-#define ATTRIBUTE_HELPID
"http://openoffice.org/2001/menu^helpid";
-#define ATTRIBUTE_LINEBREAK
"http://openoffice.org/2001/menu^linebreak";
-#define ATTRIBUTE_STYLE
"http://openoffice.org/2001/menu^style";
+#define ATTRIBUTE_ID
"http://openoffice.org/2001/menu^id";
+#define ATTRIBUTE_LABEL
"http://openoffice.org/2001/menu^label";
+#define ATTRIBUTE_HELPID
"http://openoffice.org/2001/menu^helpid";
+#define ATTRIBUTE_LINEBREAK
"http://openoffice.org/2001/menu^linebreak";
+#define ATTRIBUTE_STYLE
"http://openoffice.org/2001/menu^style";
-#define ATTRIBUTE_NS_ID "menu:id"
-#define ATTRIBUTE_NS_LABEL "menu:label"
-#define ATTRIBUTE_NS_HELPID "menu:helpid"
-#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak"
-#define ATTRIBUTE_NS_STYLE "menu:style"
+#define ATTRIBUTE_NS_ID "menu:id"
+#define ATTRIBUTE_NS_LABEL "menu:label"
+#define ATTRIBUTE_NS_HELPID "menu:helpid"
+#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak"
+#define ATTRIBUTE_NS_STYLE "menu:style"
-#define ATTRIBUTE_XMLNS_MENU "xmlns:menu"
+#define ATTRIBUTE_XMLNS_MENU "xmlns:menu"
-#define ATTRIBUTE_TYPE_CDATA "CDATA"
+#define ATTRIBUTE_TYPE_CDATA "CDATA"
-#define MENUBAR_DOCTYPE "<!DOCTYPE menu:menubar
PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">"
+#define MENUBAR_DOCTYPE "<!DOCTYPE menu:menubar
PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"menubar.dtd\">"
-#define ATTRIBUTE_ITEMSTYLE_TEXT "text"
-#define ATTRIBUTE_ITEMSTYLE_IMAGE "image"
-#define ATTRIBUTE_ITEMSTYLE_RADIO "radio"
+#define ATTRIBUTE_ITEMSTYLE_TEXT "text"
+#define ATTRIBUTE_ITEMSTYLE_IMAGE "image"
+#define ATTRIBUTE_ITEMSTYLE_RADIO "radio"
// Property names of a menu/menu item ItemDescriptor
-static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
-static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL";
-static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer";
-static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
-static const char ITEM_DESCRIPTOR_TYPE[] = "Type";
-static const char ITEM_DESCRIPTOR_STYLE[] = "Style";
+static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
+static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL";
+static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer";
+static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
+static const char ITEM_DESCRIPTOR_TYPE[] = "Type";
+static const char ITEM_DESCRIPTOR_STYLE[] = "Style";
// special popup menus (filled during runtime) must be saved as an empty popup
menu or menuitem!!!
-static const sal_Int32 CMD_PROTOCOL_SIZE = 5;
-static const char CMD_PROTOCOL[] = ".uno:";
-static const char ADDDIRECT_CMD[] = ".uno:AddDirect" ;
-static const char AUTOPILOTMENU_CMD[] = ".uno:AutoPilotMenu" ;
-static const char FILEMENU_CMD[] = ".uno:Picklist" ;
-static const char WINDOWMENU_CMD[] = ".uno:WindowList" ;
+static const sal_Int32 CMD_PROTOCOL_SIZE = 5;
+static const char CMD_PROTOCOL[] = ".uno:";
+static const char ADDDIRECT_CMD[] =
".uno:AddDirect" ;
+static const char AUTOPILOTMENU_CMD[] = ".uno:AutoPilotMenu" ;
+static const char FILEMENU_CMD[] =
".uno:Picklist" ;
+static const char WINDOWMENU_CMD[] =
".uno:WindowList" ;
//_________________________________________________________________________________________________________________
// using namespaces
@@ -124,55 +124,55 @@ namespace framework
struct MenuStyleItem
{
- sal_Int16 nBit;
- const char* attrName;
+ sal_Int16 nBit;
+ const char* attrName;
};
MenuStyleItem MenuItemStyles[ ] = {
- { ::com::sun::star::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE },
- { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT },
- { ::com::sun::star::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO }
+ { ::com::sun::star::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE },
+ { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT },
+ { ::com::sun::star::ui::ItemStyle::RADIO_CHECK,
ATTRIBUTE_ITEMSTYLE_RADIO }
};
sal_Int32 nMenuStyleItemEntries = sizeof( MenuItemStyles ) / sizeof(
MenuItemStyles[ 0 ] );
-static void ExtractMenuParameters( const Sequence< PropertyValue > rProp,
- ::rtl::OUString&
rCommandURL,
- ::rtl::OUString&
rLabel,
- ::rtl::OUString&
rHelpURL,
- Reference< XIndexAccess >& rSubMenu,
- sal_Int16& rType,
- sal_Int16& rStyle )
-{
- for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
- {
- if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
- {
- rProp[i].Value >>= rCommandURL;
- rCommandURL = rCommandURL.intern();
- }
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
- {
- rProp[i].Value >>= rHelpURL;
- }
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER ))
- {
- rProp[i].Value >>= rSubMenu;
- }
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ))
- {
- rProp[i].Value >>= rLabel;
- }
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE ))
- {
- rProp[i].Value >>= rType;
- }
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
- {
- rProp[i].Value >>= rStyle;
- }
- }
+static void ExtractMenuParameters( const Sequence< PropertyValue > rProp,
+
::rtl::OUString& rCommandURL,
+
::rtl::OUString& rLabel,
+
::rtl::OUString& rHelpURL,
+ Reference<
XIndexAccess >& rSubMenu,
+ sal_Int16&
rType,
+ sal_Int16&
rStyle )
+{
+ for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
+ {
+ if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
+ {
+ rProp[i].Value >>= rCommandURL;
+ rCommandURL = rCommandURL.intern();
+ }
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
+ {
+ rProp[i].Value >>= rHelpURL;
+ }
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_CONTAINER
))
+ {
+ rProp[i].Value >>= rSubMenu;
+ }
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ))
+ {
+ rProp[i].Value >>= rLabel;
+ }
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE ))
+ {
+ rProp[i].Value >>= rType;
+ }
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
+ {
+ rProp[i].Value >>= rStyle;
+ }
+ }
}
@@ -186,8 +186,8 @@ ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() :
m_aLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL )),
m_aContainer( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER )),
m_aHelpURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL )),
- m_aCommandURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL )),
- m_aStyle( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE ))
+ m_aCommandURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL
)),
+ m_aStyle( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE ))
{
}
@@ -229,22 +229,22 @@ throw( SAXException, RuntimeException )
void ReadMenuDocumentHandlerBase::initPropertyCommon(
Sequence< PropertyValue > &rProps, const rtl::OUString &rCommandURL,
- const rtl::OUString &rHelpId, const rtl::OUString &rLabel, sal_Int16
nItemStyleBits )
+ const rtl::OUString &rHelpId, const rtl::OUString &rLabel, sal_Int16
nItemStyleBits )
{
rProps[0].Name = m_aCommandURL;
rProps[1].Name = m_aHelpURL;
rProps[2].Name = m_aContainer;
rProps[3].Name = m_aLabel;
- rProps[4].Name = m_aStyle;
- rProps[5].Name = m_aType;
+ rProps[4].Name = m_aStyle;
+ rProps[5].Name = m_aType;
// Common values
rProps[0].Value <<= rCommandURL.intern();
rProps[1].Value <<= rHelpId;
rProps[2].Value <<= Reference< XIndexContainer >();
rProps[3].Value <<= rLabel;
- rProps[4].Value <<= nItemStyleBits;
- rProps[5].Value <<= ::com::sun::star::ui::ItemType::DEFAULT;
+ rProps[4].Value <<= nItemStyleBits;
+ rProps[5].Value <<= ::com::sun::star::ui::ItemType::DEFAULT;
}
//
-----------------------------------------------------------------------------
@@ -255,7 +255,7 @@ OReadMenuDocumentHandler::OReadMenuDocumentHandler(
: m_nElementDepth( 0 ),
m_bMenuBarMode( sal_False ),
m_xMenuBarContainer( rMenuBarContainer ),
- m_xContainerFactory( rMenuBarContainer, UNO_QUERY ),
+ m_xContainerFactory( rMenuBarContainer, UNO_QUERY ),
mxServiceFactory(xServiceFactory)
{
}
@@ -347,12 +347,12 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const
::rtl::OUString& aName
// #110897#
OReadMenuBarHandler::OReadMenuBarHandler(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- const Reference< XIndexContainer >& rMenuBarContainer,
- const Reference< XSingleComponentFactory >& rFactory )
+ const Reference< XIndexContainer >& rMenuBarContainer,
+ const Reference< XSingleComponentFactory >& rFactory )
: m_nElementDepth( 0 ),
m_bMenuMode( sal_False ),
m_xMenuBarContainer( rMenuBarContainer ),
- m_xContainerFactory( rFactory ),
+ m_xContainerFactory( rFactory ),
mxServiceFactory( xServiceFactory )
{
}
@@ -397,72 +397,72 @@ throw( SAXException, RuntimeException )
::rtl::OUString aHelpId;
::rtl::OUString aCommandId;
::rtl::OUString aLabel;
- sal_Int16 nItemBits(0);
+ sal_Int16 nItemBits(0);
m_bMenuMode = sal_True;
- // Container must be factory to create sub container
- Reference< XComponentContext > xComponentContext;
- Reference< XPropertySet > xProps(
::comphelper::getProcessServiceFactory(), UNO_QUERY );
- xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"DefaultContext" ))) >>=
- xComponentContext;
+ // Container must be factory to create sub container
+ Reference< XComponentContext > xComponentContext;
+ Reference< XPropertySet > xProps(
::comphelper::getProcessServiceFactory(), UNO_QUERY );
+ xProps->getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>=
+ xComponentContext;
- Reference< XIndexContainer > xSubItemContainer;
- if ( m_xContainerFactory.is() )
- xSubItemContainer = Reference< XIndexContainer >(
m_xContainerFactory->createInstanceWithContext( xComponentContext ), UNO_QUERY
);
+ Reference< XIndexContainer > xSubItemContainer;
+ if ( m_xContainerFactory.is() )
+ xSubItemContainer = Reference< XIndexContainer >(
m_xContainerFactory->createInstanceWithContext( xComponentContext ), UNO_QUERY
);
if ( xSubItemContainer.is() )
- {
- // read attributes for menu
- for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ )
- {
- ::rtl::OUString aName = xAttrList->getNameByIndex(
i );
- ::rtl::OUString aValue =
xAttrList->getValueByIndex( i );
- if ( aName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID )))
- aCommandId = aValue;
- else if ( aName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL )))
- aLabel = aValue;
- else if ( aName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
- aHelpId = aValue;
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
ATTRIBUTE_STYLE )))
- {
- ::rtl::OUString aTemp( aValue );
- sal_Int32 nIndex = 0;
- do
- {
- ::rtl::OUString aToken = aTemp.getToken( 0, '+',
nIndex );
- if ( aToken.getLength() > 0 )
- {
- if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
- nItemBits |=
::com::sun::star::ui::ItemStyle::TEXT;
- else if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
- nItemBits |=
::com::sun::star::ui::ItemStyle::ICON;
- else if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) )
- nItemBits |=
::com::sun::star::ui::ItemStyle::RADIO_CHECK;
- }
- }
- while ( nIndex >= 0 );
- }
- }
-
- if ( aCommandId.getLength() > 0 )
- {
- Sequence< PropertyValue > aSubMenuProp( 6 );
- initPropertyCommon( aSubMenuProp, aCommandId, aHelpId, aLabel,
nItemBits );
+ {
+ // read attributes for menu
+ for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ )
+ {
+ ::rtl::OUString aName =
xAttrList->getNameByIndex( i );
+ ::rtl::OUString aValue =
xAttrList->getValueByIndex( i );
+ if ( aName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID )))
+ aCommandId = aValue;
+ else if ( aName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL )))
+ aLabel = aValue;
+ else if ( aName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
+ aHelpId = aValue;
+ else if ( aName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE )))
+ {
+ ::rtl::OUString aTemp( aValue );
+ sal_Int32 nIndex = 0;
+ do
+ {
+ ::rtl::OUString aToken =
aTemp.getToken( 0, '+', nIndex );
+ if ( aToken.getLength() > 0 )
+ {
+ if (
aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
+ nItemBits |=
::com::sun::star::ui::ItemStyle::TEXT;
+ else if (
aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
+ nItemBits |=
::com::sun::star::ui::ItemStyle::ICON;
+ else if (
aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) )
+ nItemBits |=
::com::sun::star::ui::ItemStyle::RADIO_CHECK;
+ }
+ }
+ while ( nIndex >= 0 );
+ }
+ }
+
+ if ( aCommandId.getLength() > 0 )
+ {
+ Sequence< PropertyValue > aSubMenuProp( 6 );
+ initPropertyCommon( aSubMenuProp, aCommandId,
aHelpId, aLabel, nItemBits );
aSubMenuProp[2].Value <<= xSubItemContainer;
- m_xMenuBarContainer->insertByIndex(
m_xMenuBarContainer->getCount(), makeAny( aSubMenuProp ) );
- }
- else
- {
- ::rtl::OUString aErrorMessage =
getErrorLineString();
- aErrorMessage += ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" ));
- throw SAXException( aErrorMessage, Reference<
XInterface >(), Any() );
- }
-
- m_xReader = Reference< XDocumentHandler >( new
OReadMenuHandler( xSubItemContainer, m_xContainerFactory ));
- m_xReader->startDocument();
- }
+ m_xMenuBarContainer->insertByIndex(
m_xMenuBarContainer->getCount(), makeAny( aSubMenuProp ) );
+ }
+ else
+ {
+ ::rtl::OUString aErrorMessage =
getErrorLineString();
+ aErrorMessage += ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" ));
+ throw SAXException( aErrorMessage, Reference<
XInterface >(), Any() );
+ }
+
+ m_xReader = Reference< XDocumentHandler >( new
OReadMenuHandler( xSubItemContainer, m_xContainerFactory ));
+ m_xReader->startDocument();
+ }
}
else
{
@@ -507,12 +507,12 @@ void OReadMenuBarHandler::endElement( const
::rtl::OUString& aName )
OReadMenuHandler::OReadMenuHandler(
- const Reference< XIndexContainer >& rMenuContainer,
- const Reference< XSingleComponentFactory >& rFactory ) :
- m_nElementDepth( 0 ),
- m_bMenuPopupMode( sal_False ),
- m_xMenuContainer( rMenuContainer ),
- m_xContainerFactory( rFactory )
+ const Reference< XIndexContainer >& rMenuContainer,
+ const Reference< XSingleComponentFactory >& rFactory ) :
+ m_nElementDepth( 0 ),
+ m_bMenuPopupMode( sal_False ),
+ m_xMenuContainer( rMenuContainer ),
+ m_xContainerFactory( rFactory )
{
}
@@ -593,13 +593,13 @@ void SAL_CALL OReadMenuHandler::endElement( const
::rtl::OUString& aName )
OReadMenuPopupHandler::OReadMenuPopupHandler(
- const Reference< XIndexContainer >& rMenuContainer,
- const Reference< XSingleComponentFactory >& rFactory ) :
- m_nElementDepth( 0 ),
- m_bMenuMode( sal_False ),
- m_xMenuContainer( rMenuContainer ),
- m_xContainerFactory( rFactory ),
- m_nNextElementExpected( ELEM_CLOSE_NONE )
+ const Reference< XIndexContainer >& rMenuContainer,
+ const Reference< XSingleComponentFactory >& rFactory ) :
+ m_nElementDepth( 0 ),
+ m_bMenuMode( sal_False ),
+ m_xMenuContainer( rMenuContainer ),
+ m_xContainerFactory( rFactory ),
+ m_nNextElementExpected( ELEM_CLOSE_NONE )
{
}
@@ -633,22 +633,22 @@ throw( SAXException, RuntimeException )
::rtl::OUString aHelpId;
::rtl::OUString aCommandId;
::rtl::OUString aLabel;
- sal_Int16 nItemBits(0);
+ sal_Int16 nItemBits(0);
m_bMenuMode = sal_True;
- // Container must be factory to create sub container
- if ( !m_xComponentContext.is() )
- {
- const Reference< XPropertySet > xProps(
::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
- m_xComponentContext.set(xProps->getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), UNO_QUERY_THROW );
- }
+ // Container must be factory to create sub container
+ if ( !m_xComponentContext.is() )
+ {
+ const Reference< XPropertySet > xProps(
::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
+ m_xComponentContext.set(xProps->getPropertyValue(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))),
UNO_QUERY_THROW );
+ }
- Reference< XIndexContainer > xSubItemContainer;
- if ( m_xContainerFactory.is() )
- xSubItemContainer = Reference< XIndexContainer >(
m_xContainerFactory->createInstanceWithContext( m_xComponentContext ),
UNO_QUERY );
+ Reference< XIndexContainer > xSubItemContainer;
+ if ( m_xContainerFactory.is() )
+ xSubItemContainer = Reference< XIndexContainer >(
m_xContainerFactory->createInstanceWithContext( m_xComponentContext ),
UNO_QUERY );
- // read attributes for menu
+ // read attributes for menu
for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ )
{
::rtl::OUString aName = xAttrList->getNameByIndex( i );
@@ -659,35 +659,35 @@ throw( SAXException, RuntimeException )
aLabel = aValue;
else if ( aName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
aHelpId = aValue;
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
ATTRIBUTE_STYLE )))
- {
- ::rtl::OUString aTemp( aValue );
- sal_Int32 nIndex = 0;
- do
- {
- ::rtl::OUString aToken = aTemp.getToken( 0, '+', nIndex );
- if ( aToken.getLength() > 0 )
- {
- if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
- nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT;
- else if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
- nItemBits |= ::com::sun::star::ui::ItemStyle::ICON;
- else if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) )
- nItemBits |=
::com::sun::star::ui::ItemStyle::RADIO_CHECK;
- }
- }
- while ( nIndex >= 0 );
- }
+ else if ( aName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE )))
+ {
+ ::rtl::OUString aTemp( aValue );
+ sal_Int32 nIndex = 0;
+ do
+ {
+ ::rtl::OUString aToken =
aTemp.getToken( 0, '+', nIndex );
+ if ( aToken.getLength() > 0 )
+ {
+ if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
+ nItemBits |=
::com::sun::star::ui::ItemStyle::TEXT;
+ else if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
+ nItemBits |=
::com::sun::star::ui::ItemStyle::ICON;
+ else if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) )
+ nItemBits |=
::com::sun::star::ui::ItemStyle::RADIO_CHECK;
+ }
+ }
+ while ( nIndex >= 0 );
+ }
}
if ( aCommandId.getLength() > 0 )
{
- Sequence< PropertyValue > aSubMenuProp( 6 );
- initPropertyCommon( aSubMenuProp, aCommandId, aHelpId, aLabel,
nItemBits );
+ Sequence< PropertyValue > aSubMenuProp( 6 );
+ initPropertyCommon( aSubMenuProp, aCommandId, aHelpId,
aLabel, nItemBits );
aSubMenuProp[2].Value <<= xSubItemContainer;
- m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(),
makeAny( aSubMenuProp ) );
+ m_xMenuContainer->insertByIndex(
m_xMenuContainer->getCount(), makeAny( aSubMenuProp ) );
}
else
{
@@ -704,7 +704,7 @@ throw( SAXException, RuntimeException )
::rtl::OUString aHelpId;
::rtl::OUString aCommandId;
::rtl::OUString aLabel;
- sal_Int16 nItemBits(0);
+ sal_Int16 nItemBits(0);
// read attributes for menu item
for ( sal_Int16 i=0; i< xAttrList->getLength(); i++ )
{
@@ -716,48 +716,48 @@ throw( SAXException, RuntimeException )
aLabel = aValue;
else if ( aName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID )))
aHelpId = aValue;
- else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
ATTRIBUTE_STYLE )))
- {
- ::rtl::OUString aTemp( aValue );
- sal_Int32 nIndex = 0;
- do
- {
- ::rtl::OUString aToken = aTemp.getToken( 0, '+', nIndex );
- if ( aToken.getLength() > 0 )
- {
- if ( aToken.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
- nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT;
- else if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
- nItemBits |= ::com::sun::star::ui::ItemStyle::ICON;
- else if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) )
- nItemBits |=
::com::sun::star::ui::ItemStyle::RADIO_CHECK;
- }
- }
- while ( nIndex >= 0 );
- }
+ else if ( aName.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_STYLE )))
+ {
+ ::rtl::OUString aTemp( aValue );
+ sal_Int32 nIndex = 0;
+ do
+ {
+ ::rtl::OUString aToken =
aTemp.getToken( 0, '+', nIndex );
+ if ( aToken.getLength() > 0 )
+ {
+ if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_TEXT ) ) )
+ nItemBits |=
::com::sun::star::ui::ItemStyle::TEXT;
+ else if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_IMAGE ) ) )
+ nItemBits |=
::com::sun::star::ui::ItemStyle::ICON;
+ else if ( aToken.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ITEMSTYLE_RADIO ) ) )
+ nItemBits |=
::com::sun::star::ui::ItemStyle::RADIO_CHECK;
+ }
+ }
+ while ( nIndex >= 0 );
+ }
}
if ( aCommandId.getLength() > 0 )
{
- Sequence< PropertyValue > aMenuItem( 6 );
- initPropertyCommon( aMenuItem, aCommandId, aHelpId, aLabel,
nItemBits );
+ Sequence< PropertyValue > aMenuItem( 6 );
+ initPropertyCommon( aMenuItem, aCommandId, aHelpId,
aLabel, nItemBits );
aMenuItem[2].Value <<= Reference< XIndexContainer >();
- m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(),
makeAny( aMenuItem ) );
+ m_xMenuContainer->insertByIndex(
m_xMenuContainer->getCount(), makeAny( aMenuItem ) );
}
m_nNextElementExpected = ELEM_CLOSE_MENUITEM;
}
else if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
ELEMENT_MENUSEPARATOR )))
{
- Sequence< PropertyValue > aMenuSeparator( 1 );
- aMenuSeparator[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
ITEM_DESCRIPTOR_TYPE ));
- aMenuSeparator[0].Value <<=
::com::sun::star::ui::ItemType::SEPARATOR_LINE;
+ Sequence< PropertyValue > aMenuSeparator( 1 );
+ aMenuSeparator[0].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ));
+ aMenuSeparator[0].Value <<=
::com::sun::star::ui::ItemType::SEPARATOR_LINE;
- m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(),
makeAny( aMenuSeparator ) );
+ m_xMenuContainer->insertByIndex( m_xMenuContainer->getCount(),
makeAny( aMenuSeparator ) );
- m_nNextElementExpected = ELEM_CLOSE_MENUSEPARATOR;
+ m_nNextElementExpected = ELEM_CLOSE_MENUSEPARATOR;
}
else
{
@@ -825,8 +825,8 @@ void SAL_CALL OReadMenuPopupHandler::endElement( const
::rtl::OUString& aName )
OWriteMenuDocumentHandler::OWriteMenuDocumentHandler(
- const Reference< XIndexAccess >& rMenuBarContainer,
- const Reference< XDocumentHandler >& rDocumentHandler ) :
+ const Reference< XIndexAccess >& rMenuBarContainer,
+ const Reference< XDocumentHandler >& rDocumentHandler ) :
m_xMenuBarContainer( rMenuBarContainer ),
m_xWriteDocumentHandler( rDocumentHandler )
{
@@ -880,80 +880,80 @@ throw ( SAXException, RuntimeException )
void OWriteMenuDocumentHandler::WriteMenu( const Reference< XIndexAccess >&
rMenuContainer )
throw ( SAXException, RuntimeException )
{
- sal_Int32 nItemCount = rMenuContainer->getCount();
- sal_Bool bSeparator = sal_False;
- Any aAny;
+ sal_Int32 nItemCount = rMenuContainer->getCount();
+ sal_Bool bSeparator = sal_False;
+ Any aAny;
for ( sal_Int32 nItemPos = 0; nItemPos < nItemCount; nItemPos++ )
{
- Sequence< PropertyValue > aProps;
- aAny = rMenuContainer->getByIndex( nItemPos );
- if ( aAny >>= aProps )
- {
- ::rtl::OUString aCommandURL;
- ::rtl::OUString aLabel;
- ::rtl::OUString aHelpURL;
- sal_Int16 nType( ::com::sun::star::ui::ItemType::DEFAULT );
- sal_Int16 nItemBits( 0 );
- Reference< XIndexAccess > xSubMenu;
-
- ExtractMenuParameters( aProps, aCommandURL, aLabel, aHelpURL,
xSubMenu, nType, nItemBits );
- if ( xSubMenu.is() )
- {
- if ( aCommandURL.equalsAscii( ADDDIRECT_CMD ) ||
- aCommandURL.equalsAscii( AUTOPILOTMENU_CMD ))
- {
- WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits );
- bSeparator = sal_False;
- }
- else if (( aCommandURL.getLength() > 0 ) &&
!AddonPopupMenu::IsCommandURLPrefix ( aCommandURL ))
- {
- ::comphelper::AttributeList* pListMenu =
new ::comphelper::AttributeList;
- Reference< XAttributeList > xListMenu(
(XAttributeList *)pListMenu , UNO_QUERY );
-
- pListMenu->AddAttribute( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )),
- m_aAttributeType,
- aCommandURL );
-
- if ( !( aCommandURL.copy( CMD_PROTOCOL_SIZE
).equalsAscii( CMD_PROTOCOL )))
- pListMenu->AddAttribute( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
-
m_aAttributeType,
-
aLabel );
-
-
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
- m_xWriteDocumentHandler->startElement(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu );
-
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
- m_xWriteDocumentHandler->startElement(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )),
m_xEmptyList );
-
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
-
- WriteMenu( xSubMenu );
-
-
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
- m_xWriteDocumentHandler->endElement(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) );
-
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
- m_xWriteDocumentHandler->endElement(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) );
-
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
- bSeparator = sal_False;
- }
- }
- else
- {
- if ( nType == ::com::sun::star::ui::ItemType::DEFAULT )
- {
- if ( aCommandURL.getLength() > 0 )
- {
- bSeparator = sal_False;
- WriteMenuItem( aCommandURL, aLabel, aHelpURL,
nItemBits );
- }
- }
- else if ( !bSeparator )
- {
- // Don't write two separators together
- WriteMenuSeparator();
- bSeparator = sal_True;
- }
- }
- }
+ Sequence< PropertyValue > aProps;
+ aAny = rMenuContainer->getByIndex( nItemPos );
+ if ( aAny >>= aProps )
+ {
+ ::rtl::OUString aCommandURL;
+ ::rtl::OUString aLabel;
+ ::rtl::OUString aHelpURL;
+ sal_Int16 nType(
::com::sun::star::ui::ItemType::DEFAULT );
+ sal_Int16 nItemBits( 0 );
+ Reference< XIndexAccess > xSubMenu;
+
+ ExtractMenuParameters( aProps, aCommandURL, aLabel,
aHelpURL, xSubMenu, nType, nItemBits );
+ if ( xSubMenu.is() )
+ {
+ if ( aCommandURL.equalsAscii( ADDDIRECT_CMD ) ||
+ aCommandURL.equalsAscii(
AUTOPILOTMENU_CMD ))
+ {
+ WriteMenuItem( aCommandURL, aLabel,
aHelpURL, nItemBits );
+ bSeparator = sal_False;
+ }
+ else if (( aCommandURL.getLength() > 0 ) &&
!AddonPopupMenu::IsCommandURLPrefix ( aCommandURL ))
+ {
+ ::comphelper::AttributeList* pListMenu
= new ::comphelper::AttributeList;
+ Reference< XAttributeList > xListMenu(
(XAttributeList *)pListMenu , UNO_QUERY );
+
+ pListMenu->AddAttribute(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )),
+
m_aAttributeType,
+
aCommandURL );
+
+ if ( !( aCommandURL.copy(
CMD_PROTOCOL_SIZE ).equalsAscii( CMD_PROTOCOL )))
+ pListMenu->AddAttribute(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
+
m_aAttributeType,
+
aLabel );
+
+
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
+ m_xWriteDocumentHandler->startElement(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu );
+
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
+ m_xWriteDocumentHandler->startElement(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )),
m_xEmptyList );
+
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
+
+ WriteMenu( xSubMenu );
+
+
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
+ m_xWriteDocumentHandler->endElement(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) );
+
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
+ m_xWriteDocumentHandler->endElement(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) );
+
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
+ bSeparator = sal_False;
+ }
+ }
+ else
+ {
+ if ( nType ==
::com::sun::star::ui::ItemType::DEFAULT )
+ {
+ if ( aCommandURL.getLength() > 0 )
+ {
+ bSeparator = sal_False;
+ WriteMenuItem( aCommandURL,
aLabel, aHelpURL, nItemBits );
+ }
+ }
+ else if ( !bSeparator )
+ {
+ // Don't write two separators together
+ WriteMenuSeparator();
+ bSeparator = sal_True;
+ }
+ }
+ }
}
}
@@ -963,9 +963,9 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const
::rtl::OUString& aCommandUR
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY
);
- pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
ATTRIBUTE_NS_ID )),
- m_aAttributeType,
- aCommandURL );
+ pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
ATTRIBUTE_NS_ID )),
+ m_aAttributeType,
+ aCommandURL );
if ( aHelpURL.getLength() > 0 )
{
@@ -974,30 +974,30 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const
::rtl::OUString& aCommandUR
aHelpURL );
}
- if (( aLabel.getLength() > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE
).equalsAscii( CMD_PROTOCOL )))
- {
- pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
ATTRIBUTE_NS_LABEL )),
- m_aAttributeType,
- aLabel );
- }
- if (( nStyle > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE
).equalsAscii( CMD_PROTOCOL )))
- {
- rtl::OUString aValue;
- MenuStyleItem* pStyle = MenuItemStyles;
-
- for ( sal_Int32 nIndex = 0; nIndex < nMenuStyleItemEntries; ++nIndex,
++pStyle )
- {
- if ( nStyle & pStyle->nBit )
- {
- if ( aValue.getLength() )
- aValue = aValue.concat( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("+") ) );
- aValue += rtl::OUString::createFromAscii( pStyle->attrName );
- }
- }
- pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
ATTRIBUTE_NS_STYLE )),
- m_aAttributeType,
- aValue );
- }
+ if (( aLabel.getLength() > 0 ) && !( aCommandURL.copy(
CMD_PROTOCOL_SIZE ).equalsAscii( CMD_PROTOCOL )))
+ {
+ pList->AddAttribute( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )),
+ m_aAttributeType,
+ aLabel );
+ }
+ if (( nStyle > 0 ) && !( aCommandURL.copy( CMD_PROTOCOL_SIZE
).equalsAscii( CMD_PROTOCOL )))
+ {
+ rtl::OUString aValue;
+ MenuStyleItem* pStyle = MenuItemStyles;
+
+ for ( sal_Int32 nIndex = 0; nIndex < nMenuStyleItemEntries;
++nIndex, ++pStyle )
+ {
+ if ( nStyle & pStyle->nBit )
+ {
+ if ( aValue.getLength() )
+ aValue = aValue.concat( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("+") ) );
+ aValue += rtl::OUString::createFromAscii(
pStyle->attrName );
+ }
+ }
+ pList->AddAttribute( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_STYLE )),
+ m_aAttributeType,
+ aValue );
+ }
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
m_xWriteDocumentHandler->startElement( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )), xList );
@@ -1015,4 +1015,3 @@ void OWriteMenuDocumentHandler::WriteMenuSeparator()
}
} // namespace framework
-
diff --git a/main/framework/source/fwe/xml/saxnamespacefilter.cxx
b/main/framework/source/fwe/xml/saxnamespacefilter.cxx
index 46e6308..cf81191 100644
--- a/main/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/main/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -48,10 +48,10 @@ namespace framework{
SaxNamespaceFilter::SaxNamespaceFilter( Reference< XDocumentHandler >&
rSax1DocumentHandler ) :
- ThreadHelpBase( &Application::GetSolarMutex() ),
- m_xLocator( 0 ),
- xDocumentHandler( rSax1DocumentHandler ),
- m_nDepth( 0 )
+ ThreadHelpBase( &Application::GetSolarMutex() ),
+ m_xLocator( 0 ),
+ xDocumentHandler( rSax1DocumentHandler ),
+ m_nDepth( 0 )
{
}
@@ -100,8 +100,8 @@ void SAL_CALL SaxNamespaceFilter::startElement(
{
// apply namespaces to all remaining attributes
for ( ::std::vector< sal_Int16 >::const_iterator i(
- aAttributeIndexes.begin());
- i != aAttributeIndexes.end(); ++i )
+ aAttributeIndexes.begin());
+ i != aAttributeIndexes.end(); ++i )
{
::rtl::OUString aAttributeName =
xAttribs->getNameByIndex( *i );
::rtl::OUString aValue
= xAttribs->getValueByIndex( *i );
@@ -191,4 +191,3 @@ void SAL_CALL SaxNamespaceFilter::setDocumentLocator(
}
} // namespace
-
diff --git a/main/framework/source/fwe/xml/statusbarconfiguration.cxx
b/main/framework/source/fwe/xml/statusbarconfiguration.cxx
index d0d1d40..643994f 100644
--- a/main/framework/source/fwe/xml/statusbarconfiguration.cxx
+++ b/main/framework/source/fwe/xml/statusbarconfiguration.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,21 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
#include <framework/statusbarconfiguration.hxx>
@@ -81,22 +80,22 @@ sal_Bool StatusBarConfiguration::LoadStatusBar(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >&,
SvStream&, StatusBarDescriptor& )
{
- // obsolete - only support linkage of binary filters!
- return sal_True;
+ // obsolete - only support linkage of binary filters!
+ return sal_True;
}
sal_Bool StatusBarConfiguration::StoreStatusBar(
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >&,
SvStream&, const StatusBarDescriptor& )
{
- // obsolete - only support linkage of binary filters!
- return sal_True;
+ // obsolete - only support linkage of binary filters!
+ return sal_True;
}
sal_Bool StatusBarConfiguration::LoadStatusBar(
const Reference< XMultiServiceFactory >& xServiceFactory,
- const Reference< XInputStream >& xInputStream,
- const Reference< XIndexContainer >& rStatusbarConfiguration )
+ const Reference< XInputStream >& xInputStream,
+ const Reference< XIndexContainer >& rStatusbarConfiguration )
{
Reference< XParser > xParser( GetSaxParser( xServiceFactory ) );
@@ -132,8 +131,8 @@ sal_Bool StatusBarConfiguration::LoadStatusBar(
sal_Bool StatusBarConfiguration::StoreStatusBar(
const Reference< XMultiServiceFactory >& xServiceFactory,
- const Reference< XOutputStream >& xOutputStream,
- const Reference< XIndexAccess >& rStatusbarConfiguration )
+ const Reference< XOutputStream >& xOutputStream,
+ const Reference< XIndexAccess >& rStatusbarConfiguration )
{
Reference< XDocumentHandler > xWriter( GetSaxWriter( xServiceFactory )
);
Reference< ::com::sun::star::io::XActiveDataSource> xDataSource(
xWriter , UNO_QUERY );
@@ -159,4 +158,3 @@ sal_Bool StatusBarConfiguration::StoreStatusBar(
}
}
}
-
diff --git a/main/framework/source/fwe/xml/statusbardocumenthandler.cxx
b/main/framework/source/fwe/xml/statusbardocumenthandler.cxx
index d452023..008a30e 100644
--- a/main/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/main/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -80,7 +80,7 @@ using namespace ::com::sun::star::container;
#define ATTRIBUTE_OFFSET "offset"
#define ATTRIBUTE_AUTOSIZE "autosize"
#define ATTRIBUTE_OWNERDRAW "ownerdraw"
-#define ATTRIBUTE_HELPURL "helpid"
+#define ATTRIBUTE_HELPURL "helpid"
#define ELEMENT_NS_STATUSBAR "statusbar:statusbar"
#define ELEMENT_NS_STATUSBARITEM "statusbar:statusbaritem"
@@ -107,45 +107,45 @@ namespace framework
{
// Property names of a menu/menu item ItemDescriptor
-static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
-static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL";
-static const char ITEM_DESCRIPTOR_OFFSET[] = "Offset";
-static const char ITEM_DESCRIPTOR_STYLE[] = "Style";
-static const char ITEM_DESCRIPTOR_WIDTH[] = "Width";
-static const char ITEM_DESCRIPTOR_TYPE[] = "Type";
+static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
+static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL";
+static const char ITEM_DESCRIPTOR_OFFSET[] = "Offset";
+static const char ITEM_DESCRIPTOR_STYLE[] = "Style";
+static const char ITEM_DESCRIPTOR_WIDTH[] = "Width";
+static const char ITEM_DESCRIPTOR_TYPE[] = "Type";
static void ExtractStatusbarItemParameters(
- const Sequence< PropertyValue > rProp,
- ::rtl::OUString& rCommandURL,
- ::rtl::OUString& rHelpURL,
- sal_Int16& rOffset,
- sal_Int16& rStyle,
- sal_Int16& rWidth )
+ const Sequence< PropertyValue > rProp,
+ ::rtl::OUString& rCommandURL,
+ ::rtl::OUString& rHelpURL,
+ sal_Int16& rOffset,
+ sal_Int16& rStyle,
+ sal_Int16& rWidth )
{
- for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
- {
- if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
- {
- rProp[i].Value >>= rCommandURL;
- rCommandURL = rCommandURL.intern();
- }
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
- {
- rProp[i].Value >>= rHelpURL;
- }
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_OFFSET ))
- {
- rProp[i].Value >>= rOffset;
- }
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
- {
- rProp[i].Value >>= rStyle;
- }
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_WIDTH ))
- {
- rProp[i].Value >>= rWidth;
- }
- }
+ for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
+ {
+ if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
+ {
+ rProp[i].Value >>= rCommandURL;
+ rCommandURL = rCommandURL.intern();
+ }
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
+ {
+ rProp[i].Value >>= rHelpURL;
+ }
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_OFFSET ))
+ {
+ rProp[i].Value >>= rOffset;
+ }
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
+ {
+ rProp[i].Value >>= rStyle;
+ }
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_WIDTH ))
+ {
+ rProp[i].Value >>= rWidth;
+ }
+ }
}
struct StatusBarEntryProperty
@@ -165,14 +165,14 @@ StatusBarEntryProperty
StatusBarEntries[OReadStatusBarDocumentHandler::SB_XML_EN
{ OReadStatusBarDocumentHandler::SB_NS_STATUSBAR,
ATTRIBUTE_OWNERDRAW },
{ OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_WIDTH
},
{ OReadStatusBarDocumentHandler::SB_NS_STATUSBAR,
ATTRIBUTE_OFFSET },
- { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR, ATTRIBUTE_HELPURL
}
+ { OReadStatusBarDocumentHandler::SB_NS_STATUSBAR,
ATTRIBUTE_HELPURL }
};
OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler(
- const Reference< XIndexContainer >& rStatusBarItems ) :
+ const Reference< XIndexContainer >& rStatusBarItems ) :
ThreadHelpBase( &Application::GetSolarMutex() ),
- m_aStatusBarItems( rStatusBarItems )
+ m_aStatusBarItems( rStatusBarItems )
{
::rtl::OUString aNamespaceStatusBar( RTL_CONSTASCII_USTRINGPARAM(
XMLNS_STATUSBAR ));
::rtl::OUString aNamespaceXLink( RTL_CONSTASCII_USTRINGPARAM(
XMLNS_XLINK ));
@@ -266,12 +266,12 @@ throw( SAXException, RuntimeException )
throw SAXException( aErrorMessage,
Reference< XInterface >(), Any() );
}
- ::rtl::OUString aCommandURL;
- ::rtl::OUString aHelpURL;
- sal_Int16 nItemBits(
ItemStyle::ALIGN_CENTER|ItemStyle::DRAW_IN3D );
- sal_Int16 nWidth( 0 );
- sal_Int16 nOffset( STATUSBAR_OFFSET );
- sal_Bool bCommandURL( sal_False );
+ ::rtl::OUString aCommandURL;
+ ::rtl::OUString aHelpURL;
+ sal_Int16 nItemBits(
ItemStyle::ALIGN_CENTER|ItemStyle::DRAW_IN3D );
+ sal_Int16 nWidth( 0 );
+ sal_Int16 nOffset( STATUSBAR_OFFSET );
+ sal_Bool bCommandURL( sal_False );
m_bStatusBarItemStartFound = sal_True;
for ( sal_Int16 n = 0; n <
xAttribs->getLength(); n++ )
@@ -292,7 +292,7 @@ throw( SAXException, RuntimeException )
{
if (
xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
ATTRIBUTE_ALIGN_LEFT )) )
{
- nItemBits |= ItemStyle::ALIGN_LEFT;
+
nItemBits |= ItemStyle::ALIGN_LEFT;
nItemBits &= ~ItemStyle::ALIGN_CENTER;
}
else if (
xAttribs->getValueByIndex( n ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
ATTRIBUTE_ALIGN_CENTER )) )
@@ -380,14 +380,14 @@ throw( SAXException, RuntimeException )
}
break;
- case SB_ATTRIBUTE_HELPURL:
- {
- aHelpURL =
xAttribs->getValueByIndex( n );
- }
- break;
+ case
SB_ATTRIBUTE_HELPURL:
+ {
+ aHelpURL =
xAttribs->getValueByIndex( n );
+ }
+ break;
- default:
- break;
+ default:
+ break;
}
}
} // for
@@ -398,30 +398,30 @@ throw( SAXException, RuntimeException )
aErrorMessage += ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Required attribute statusbar:url must have a
value!" ));
throw SAXException( aErrorMessage,
Reference< XInterface >(), Any() );
}
- else
- {
- Sequence< PropertyValue > aStatusbarItemProp( 6 );
- aStatusbarItemProp[0].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ));
- aStatusbarItemProp[1].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ));
- aStatusbarItemProp[2].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_OFFSET ));
- aStatusbarItemProp[3].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE ));
- aStatusbarItemProp[4].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_WIDTH ));
- aStatusbarItemProp[5].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ));
-
- aStatusbarItemProp[0].Value <<= aCommandURL;
- aStatusbarItemProp[1].Value <<= aHelpURL;
- aStatusbarItemProp[2].Value <<= nOffset;
- aStatusbarItemProp[3].Value <<= nItemBits;
- aStatusbarItemProp[4].Value <<= nWidth;
- aStatusbarItemProp[5].Value = makeAny(
::com::sun::star::ui::ItemType::DEFAULT );
-
- m_aStatusBarItems->insertByIndex(
m_aStatusBarItems->getCount(), makeAny( aStatusbarItemProp ) );
- }
+ else
+ {
+ Sequence< PropertyValue >
aStatusbarItemProp( 6 );
+ aStatusbarItemProp[0].Name =
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ));
+ aStatusbarItemProp[1].Name =
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL ));
+ aStatusbarItemProp[2].Name =
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_OFFSET ));
+ aStatusbarItemProp[3].Name =
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE ));
+ aStatusbarItemProp[4].Name =
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_WIDTH ));
+ aStatusbarItemProp[5].Name =
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ));
+
+ aStatusbarItemProp[0].Value <<=
aCommandURL;
+ aStatusbarItemProp[1].Value <<=
aHelpURL;
+ aStatusbarItemProp[2].Value <<=
nOffset;
+ aStatusbarItemProp[3].Value <<=
nItemBits;
+ aStatusbarItemProp[4].Value <<=
nWidth;
+ aStatusbarItemProp[5].Value =
makeAny( ::com::sun::star::ui::ItemType::DEFAULT );
+
+
m_aStatusBarItems->insertByIndex( m_aStatusBarItems->getCount(), makeAny(
aStatusbarItemProp ) );
+ }
}
break;
- default:
- break;
+ default:
+ break;
}
}
}
@@ -462,8 +462,8 @@ throw( SAXException, RuntimeException )
}
break;
- default:
- break;
+ default:
+ break;
}
}
}
@@ -514,9 +514,9 @@ throw( SAXException, RuntimeException )
//_________________________________________________________________________________________________________________
OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler(
- const Reference< XIndexAccess >& aStatusBarItems,
- const Reference< XDocumentHandler >& rWriteDocumentHandler ) :
- ThreadHelpBase( &Application::GetSolarMutex() ),
+ const Reference< XIndexAccess >& aStatusBarItems,
+ const Reference< XDocumentHandler >& rWriteDocumentHandler ) :
+ ThreadHelpBase( &Application::GetSolarMutex() ),
m_aStatusBarItems( aStatusBarItems ),
m_xWriteDocumentHandler( rWriteDocumentHandler )
{
@@ -560,33 +560,33 @@ void
OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
m_xWriteDocumentHandler->startElement( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_STATUSBAR )), pList );
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
- sal_Int32 nItemCount = m_aStatusBarItems->getCount();
- Any aAny;
+ sal_Int32 nItemCount = m_aStatusBarItems->getCount();
+ Any aAny;
for ( sal_Int32 nItemPos = 0; nItemPos < nItemCount; nItemPos++ )
{
- Sequence< PropertyValue > aProps;
- aAny = m_aStatusBarItems->getByIndex( nItemPos );
- if ( aAny >>= aProps )
- {
- ::rtl::OUString aCommandURL;
- ::rtl::OUString aHelpURL;
- sal_Int16 nStyle( ItemStyle::ALIGN_CENTER|ItemStyle::DRAW_IN3D );
- sal_Int16 nWidth( 0 );
- sal_Int16 nOffset( STATUSBAR_OFFSET );
-
- ExtractStatusbarItemParameters(
- aProps,
- aCommandURL,
- aHelpURL,
- nOffset,
- nStyle,
- nWidth );
-
- if ( aCommandURL.getLength() > 0 )
- WriteStatusBarItem( aCommandURL, aHelpURL, nOffset, nStyle,
nWidth );
- }
- }
+ Sequence< PropertyValue > aProps;
+ aAny = m_aStatusBarItems->getByIndex( nItemPos );
+ if ( aAny >>= aProps )
+ {
+ ::rtl::OUString aCommandURL;
+ ::rtl::OUString aHelpURL;
+ sal_Int16 nStyle(
ItemStyle::ALIGN_CENTER|ItemStyle::DRAW_IN3D );
+ sal_Int16 nWidth( 0 );
+ sal_Int16 nOffset( STATUSBAR_OFFSET );
+
+ ExtractStatusbarItemParameters(
+ aProps,
+ aCommandURL,
+ aHelpURL,
+ nOffset,
+ nStyle,
+ nWidth );
+
+ if ( aCommandURL.getLength() > 0 )
+ WriteStatusBarItem( aCommandURL, aHelpURL,
nOffset, nStyle, nWidth );
+ }
+ }
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
m_xWriteDocumentHandler->endElement( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_STATUSBAR )) );
@@ -599,11 +599,11 @@ void
OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
//_________________________________________________________________________________________________________________
void OWriteStatusBarDocumentHandler::WriteStatusBarItem(
- const rtl::OUString& rCommandURL,
- const rtl::OUString& /*rHelpURL*/,
- sal_Int16 nOffset,
- sal_Int16 nStyle,
- sal_Int16 nWidth )
+ const rtl::OUString& rCommandURL,
+ const rtl::OUString& /*rHelpURL*/,
+ sal_Int16 nOffset,
+ sal_Int16 nStyle,
+ sal_Int16 nWidth )
throw ( SAXException, RuntimeException )
{
::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
@@ -615,7 +615,7 @@ throw ( SAXException, RuntimeException )
m_aAttributeURL += ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_URL ));
}
- // save required attribute (URL)
+ // save required attribute (URL)
pList->AddAttribute( m_aAttributeURL, m_aAttributeType, rCommandURL );
// alignment
@@ -691,4 +691,3 @@ throw ( SAXException, RuntimeException )
}
} // namespace framework
-
diff --git a/main/framework/source/fwe/xml/toolboxconfiguration.cxx
b/main/framework/source/fwe/xml/toolboxconfiguration.cxx
index 5069f59..92df862 100644
--- a/main/framework/source/fwe/xml/toolboxconfiguration.cxx
+++ b/main/framework/source/fwe/xml/toolboxconfiguration.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,21 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
#include <framework/toolboxconfiguration.hxx>
@@ -149,4 +148,3 @@ sal_Bool ToolBoxConfiguration::StoreToolBox(
}
}
-
diff --git a/main/framework/source/fwe/xml/toolboxdocumenthandler.cxx
b/main/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index c56bb7f..00443e8 100644
--- a/main/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/main/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -70,64 +70,64 @@ namespace framework
{
// Property names of a menu/menu item ItemDescriptor
-static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
-static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL";
-static const char ITEM_DESCRIPTOR_TOOLTIP[] = "Tooltip";
-static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
-static const char ITEM_DESCRIPTOR_TYPE[] = "Type";
-static const char ITEM_DESCRIPTOR_STYLE[] = "Style";
-static const char ITEM_DESCRIPTOR_VISIBLE[] = "IsVisible";
-static const char ITEM_DESCRIPTOR_WIDTH[] = "Width";
-
-static void ExtractToolbarParameters( const Sequence< PropertyValue > rProp,
- ::rtl::OUString&
rCommandURL,
- ::rtl::OUString&
rLabel,
- ::rtl::OUString&
rHelpURL,
- ::rtl::OUString&
rTooltip,
- sal_Int16& rStyle,
- sal_Int16& rWidth,
- sal_Bool& rVisible,
- sal_Int16& rType )
+static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
+static const char ITEM_DESCRIPTOR_HELPURL[] = "HelpURL";
+static const char ITEM_DESCRIPTOR_TOOLTIP[] = "Tooltip";
+static const char ITEM_DESCRIPTOR_LABEL[] = "Label";
+static const char ITEM_DESCRIPTOR_TYPE[] = "Type";
+static const char ITEM_DESCRIPTOR_STYLE[] = "Style";
+static const char ITEM_DESCRIPTOR_VISIBLE[] = "IsVisible";
+static const char ITEM_DESCRIPTOR_WIDTH[] = "Width";
+
+static void ExtractToolbarParameters( const Sequence< PropertyValue > rProp,
+
::rtl::OUString& rCommandURL,
+
::rtl::OUString& rLabel,
+
::rtl::OUString& rHelpURL,
+
::rtl::OUString& rTooltip,
+
sal_Int16& rStyle,
+
sal_Int16& rWidth,
+
sal_Bool& rVisible,
+
sal_Int16& rType )
{
- for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
- {
- if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
- {
- rProp[i].Value >>= rCommandURL;
- rCommandURL = rCommandURL.intern();
- }
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
- rProp[i].Value >>= rHelpURL;
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TOOLTIP ))
- rProp[i].Value >>= rTooltip;
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ))
- rProp[i].Value >>= rLabel;
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE ))
- rProp[i].Value >>= rType;
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_VISIBLE ))
- rProp[i].Value >>= rVisible;
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_WIDTH ))
- rProp[i].Value >>= rWidth;
- else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
- rProp[i].Value >>= rStyle;
- }
+ for ( sal_Int32 i = 0; i < rProp.getLength(); i++ )
+ {
+ if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_COMMANDURL ))
+ {
+ rProp[i].Value >>= rCommandURL;
+ rCommandURL = rCommandURL.intern();
+ }
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_HELPURL ))
+ rProp[i].Value >>= rHelpURL;
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TOOLTIP ))
+ rProp[i].Value >>= rTooltip;
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_LABEL ))
+ rProp[i].Value >>= rLabel;
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_TYPE ))
+ rProp[i].Value >>= rType;
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_VISIBLE ))
+ rProp[i].Value >>= rVisible;
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_WIDTH ))
+ rProp[i].Value >>= rWidth;
+ else if ( rProp[i].Name.equalsAscii( ITEM_DESCRIPTOR_STYLE ))
+ rProp[i].Value >>= rStyle;
+ }
}
struct ToolboxStyleItem
{
- sal_Int16 nBit;
- const char* attrName;
+ sal_Int16 nBit;
+ const char* attrName;
};
ToolboxStyleItem Styles[ ] = {
- { ::com::sun::star::ui::ItemStyle::RADIO_CHECK, ATTRIBUTE_ITEMSTYLE_RADIO
},
- { ::com::sun::star::ui::ItemStyle::ALIGN_LEFT, ATTRIBUTE_ITEMSTYLE_LEFT },
- { ::com::sun::star::ui::ItemStyle::AUTO_SIZE, ATTRIBUTE_ITEMSTYLE_AUTO },
- { ::com::sun::star::ui::ItemStyle::REPEAT, ATTRIBUTE_ITEMSTYLE_REPEAT },
- { ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY,
ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY },
- { ::com::sun::star::ui::ItemStyle::DROP_DOWN, ATTRIBUTE_ITEMSTYLE_DROPDOWN
},
- { ::com::sun::star::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE },
- { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT },
+ { ::com::sun::star::ui::ItemStyle::RADIO_CHECK,
ATTRIBUTE_ITEMSTYLE_RADIO },
+ { ::com::sun::star::ui::ItemStyle::ALIGN_LEFT, ATTRIBUTE_ITEMSTYLE_LEFT
},
+ { ::com::sun::star::ui::ItemStyle::AUTO_SIZE, ATTRIBUTE_ITEMSTYLE_AUTO
},
+ { ::com::sun::star::ui::ItemStyle::REPEAT, ATTRIBUTE_ITEMSTYLE_REPEAT },
+ { ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY,
ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY },
+ { ::com::sun::star::ui::ItemStyle::DROP_DOWN,
ATTRIBUTE_ITEMSTYLE_DROPDOWN },
+ { ::com::sun::star::ui::ItemStyle::ICON, ATTRIBUTE_ITEMSTYLE_IMAGE },
+ { ::com::sun::star::ui::ItemStyle::TEXT, ATTRIBUTE_ITEMSTYLE_TEXT },
};
sal_Int32 nStyleItemEntries = sizeof( Styles ) / sizeof( Styles[ 0 ] );
@@ -154,20 +154,20 @@ ToolBarEntryProperty
ToolBoxEntries[OReadToolBoxDocumentHandler::TB_XML_ENTRY_CO
{ OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_USER
},
{ OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_HELPID
},
{ OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_ITEMSTYLE
},
- { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_UINAME
},
- { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_TOOLTIP
},
+ { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_UINAME
},
+ { OReadToolBoxDocumentHandler::TB_NS_TOOLBAR, ATTRIBUTE_TOOLTIP
},
};
OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference<
XIndexContainer >& rItemContainer ) :
ThreadHelpBase( &Application::GetSolarMutex() ),
- m_rItemContainer( rItemContainer ),
- m_aType( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE )),
- m_aLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL )),
- m_aStyle( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE )),
- m_aHelpURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL )),
- m_aTooltip( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TOOLTIP )),
- m_aIsVisible( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_VISIBLE )),
- m_aCommandURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ))
+ m_rItemContainer( rItemContainer ),
+ m_aType( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE )),
+ m_aLabel( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL )),
+ m_aStyle( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_STYLE )),
+ m_aHelpURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_HELPURL )),
+ m_aTooltip( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TOOLTIP )),
+ m_aIsVisible( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_VISIBLE )),
+ m_aCommandURL( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL
))
{
::rtl::OUString aNamespaceToolBar( RTL_CONSTASCII_USTRINGPARAM(
XMLNS_TOOLBAR ));
::rtl::OUString aNamespaceXLink( RTL_CONSTASCII_USTRINGPARAM(
XMLNS_XLINK ));
@@ -193,15 +193,15 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler(
const Reference< XInde
}
// pre-calculate a hash code for all style strings to speed up xml read
process
- m_nHashCode_Style_Radio = ::rtl::OUString::createFromAscii(
ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode();
- m_nHashCode_Style_Auto = ::rtl::OUString::createFromAscii(
ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode();
- m_nHashCode_Style_Left = ::rtl::OUString::createFromAscii(
ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode();
- m_nHashCode_Style_AutoSize = ::rtl::OUString::createFromAscii(
ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode();
- m_nHashCode_Style_DropDown = ::rtl::OUString::createFromAscii(
ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode();
- m_nHashCode_Style_Repeat = ::rtl::OUString::createFromAscii(
ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode();
- m_nHashCode_Style_DropDownOnly = ::rtl::OUString::createFromAscii(
ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode();
- m_nHashCode_Style_Text = ::rtl::OUString::createFromAscii(
ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode();
- m_nHashCode_Style_Image = ::rtl::OUString::createFromAscii(
ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode();
+ m_nHashCode_Style_Radio =
::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_RADIO ).hashCode();
+ m_nHashCode_Style_Auto =
::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTO ).hashCode();
+ m_nHashCode_Style_Left =
::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_LEFT ).hashCode();
+ m_nHashCode_Style_AutoSize =
::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_AUTOSIZE ).hashCode();
+ m_nHashCode_Style_DropDown =
::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_DROPDOWN ).hashCode();
+ m_nHashCode_Style_Repeat =
::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_REPEAT ).hashCode();
+ m_nHashCode_Style_DropDownOnly = ::rtl::OUString::createFromAscii(
ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY ).hashCode();
+ m_nHashCode_Style_Text =
::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_TEXT ).hashCode();
+ m_nHashCode_Style_Image =
::rtl::OUString::createFromAscii( ATTRIBUTE_ITEMSTYLE_IMAGE ).hashCode();
m_bToolBarStartFound = sal_False;
m_bToolBarEndFound = sal_False;
@@ -250,46 +250,46 @@ throw( SAXException, RuntimeException )
{
if ( m_bToolBarStartFound )
{
- ::rtl::OUString aErrorMessage =
getErrorLineString();
- aErrorMessage += ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Element 'toolbar:toolbar' cannot be embedded into
'toolbar:toolbar'!" ));
- throw SAXException( aErrorMessage,
Reference< XInterface >(), Any() );
+ ::rtl::OUString aErrorMessage =
getErrorLineString();
+ aErrorMessage += ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "Element 'toolbar:toolbar' cannot be embedded into
'toolbar:toolbar'!" ));
+ throw SAXException( aErrorMessage,
Reference< XInterface >(), Any() );
}
- else
- {
- // Check if we have a UI name set in our XML file
- ::rtl::OUString aUIName;
- for ( sal_Int16 n = 0; n < xAttribs->getLength();
n++ )
- {
- pToolBoxEntry = m_aToolBoxMap.find(
xAttribs->getNameByIndex( n ) );
- if ( pToolBoxEntry !=
m_aToolBoxMap.end() )
- {
- switch ( pToolBoxEntry->second )
- {
- case TB_ATTRIBUTE_UINAME:
- aUIName =
xAttribs->getValueByIndex( n );
- break;
- default:
- break;
- }
- }
- }
-
- if ( aUIName.getLength() > 0 )
- {
- // Try to set UI name as a container property
- Reference< XPropertySet > xPropSet(
m_rItemContainer, UNO_QUERY );
- if ( xPropSet.is() )
- {
- try
- {
- xPropSet->setPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIName" )), makeAny( aUIName ) );
- }
- catch ( UnknownPropertyException& )
- {
- }
- }
- }
- }
+ else
+ {
+ // Check if we have a UI name
set in our XML file
+ ::rtl::OUString aUIName;
+ for ( sal_Int16 n = 0; n <
xAttribs->getLength(); n++ )
+ {
+ pToolBoxEntry =
m_aToolBoxMap.find( xAttribs->getNameByIndex( n ) );
+ if ( pToolBoxEntry !=
m_aToolBoxMap.end() )
+ {
+ switch (
pToolBoxEntry->second )
+ {
+ case
TB_ATTRIBUTE_UINAME:
+ aUIName =
xAttribs->getValueByIndex( n );
+ break;
+
default:
+
break;
+ }
+ }
+ }
+
+ if (
aUIName.getLength() > 0 )
+ {
+ // Try to set
UI name as a container property
+ Reference<
XPropertySet > xPropSet( m_rItemContainer, UNO_QUERY );
+ if (
xPropSet.is() )
+ {
+ try
+ {
+
xPropSet->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"UIName" )), makeAny( aUIName ) );
+ }
+ catch (
UnknownPropertyException& )
+ {
+ }
+ }
+ }
+ }
m_bToolBarStartFound = sal_True;
}
@@ -318,15 +318,15 @@ throw( SAXException, RuntimeException )
sal_Bool bAttributeURL = sal_False;
m_bToolBarItemStartFound = sal_True;
- ::rtl::OUString aLabel;
- ::rtl::OUString aCommandURL;
- ::rtl::OUString aHelpURL;
- ::rtl::OUString aTooltip;
- ::rtl::OUString aBitmapName;
- sal_uInt16 nItemBits( 0 );
- sal_uInt16 nWidth( 0 );
- sal_uInt16 nUserDef( 0 );
- sal_Bool bVisible( sal_True );
+ ::rtl::OUString aLabel;
+ ::rtl::OUString aCommandURL;
+ ::rtl::OUString aHelpURL;
+ ::rtl::OUString aTooltip;
+ ::rtl::OUString aBitmapName;
+ sal_uInt16 nItemBits( 0 );
+ sal_uInt16 nWidth( 0 );
+ sal_uInt16 nUserDef( 0 );
+ sal_Bool bVisible(
sal_True );
for ( sal_Int16 n = 0; n <
xAttribs->getLength(); n++ )
{
@@ -393,11 +393,11 @@ throw( SAXException, RuntimeException )
}
break;
- case TB_ATTRIBUTE_TOOLTIP:
- {
- aTooltip = xAttribs->getValueByIndex( n );
- }
- break;
+ case
TB_ATTRIBUTE_TOOLTIP:
+ {
+ aTooltip =
xAttribs->getValueByIndex( n );
+ }
+ break;
case TB_ATTRIBUTE_STYLE:
{
@@ -412,31 +412,31 @@ throw( SAXException, RuntimeException )
{
sal_Int32 nHashCode = aToken.hashCode();
if ( nHashCode == m_nHashCode_Style_Radio )
- nItemBits |=
::com::sun::star::ui::ItemStyle::RADIO_CHECK;
+
nItemBits |= ::com::sun::star::ui::ItemStyle::RADIO_CHECK;
else if ( nHashCode == m_nHashCode_Style_Left )
- nItemBits |=
::com::sun::star::ui::ItemStyle::ALIGN_LEFT;
+
nItemBits |= ::com::sun::star::ui::ItemStyle::ALIGN_LEFT;
else if ( nHashCode == m_nHashCode_Style_AutoSize )
- nItemBits |=
::com::sun::star::ui::ItemStyle::AUTO_SIZE;
+
nItemBits |= ::com::sun::star::ui::ItemStyle::AUTO_SIZE;
else if ( nHashCode == m_nHashCode_Style_DropDown )
- nItemBits |=
::com::sun::star::ui::ItemStyle::DROP_DOWN;
+
nItemBits |= ::com::sun::star::ui::ItemStyle::DROP_DOWN;
else if ( nHashCode == m_nHashCode_Style_Repeat )
- nItemBits |=
::com::sun::star::ui::ItemStyle::REPEAT;
- else if ( nHashCode ==
m_nHashCode_Style_DropDownOnly )
- nItemBits |=
::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY;
- else if ( nHashCode ==
m_nHashCode_Style_DropDown )
- nItemBits |=
::com::sun::star::ui::ItemStyle::DROP_DOWN;
- else if ( nHashCode ==
m_nHashCode_Style_Text )
- nItemBits |=
::com::sun::star::ui::ItemStyle::TEXT;
- else if ( nHashCode ==
m_nHashCode_Style_Image )
- nItemBits |=
::com::sun::star::ui::ItemStyle::ICON;
+
nItemBits |= ::com::sun::star::ui::ItemStyle::REPEAT;
+
else if ( nHashCode == m_nHashCode_Style_DropDownOnly )
+
nItemBits |= ::com::sun::star::ui::ItemStyle::DROPDOWN_ONLY;
+
else if ( nHashCode == m_nHashCode_Style_DropDown )
+
nItemBits |= ::com::sun::star::ui::ItemStyle::DROP_DOWN;
+
else if ( nHashCode == m_nHashCode_Style_Text )
+
nItemBits |= ::com::sun::star::ui::ItemStyle::TEXT;
+
else if ( nHashCode == m_nHashCode_Style_Image )
+
nItemBits |= ::com::sun::star::ui::ItemStyle::ICON;
}
}
while ( nIndex
>= 0 );
}
break;
- default:
- break;
+ default:
+ break;
}
}
} // for
@@ -448,27 +448,27 @@ throw( SAXException, RuntimeException )
throw SAXException( aErrorMessage,
Reference< XInterface >(), Any() );
}
- if ( aCommandURL.getLength() > 0 )
- {
- Sequence< PropertyValue > aToolbarItemProp( 7 );
- aToolbarItemProp[0].Name = m_aCommandURL;
- aToolbarItemProp[1].Name = m_aHelpURL;
- aToolbarItemProp[2].Name = m_aLabel;
- aToolbarItemProp[3].Name = m_aType;
- aToolbarItemProp[4].Name = m_aStyle;
- aToolbarItemProp[5].Name = m_aIsVisible;
- aToolbarItemProp[6].Name = m_aTooltip;
-
- aToolbarItemProp[0].Value <<= aCommandURL;
- aToolbarItemProp[1].Value <<= aHelpURL;
- aToolbarItemProp[2].Value <<= aLabel;
- aToolbarItemProp[3].Value = makeAny(
::com::sun::star::ui::ItemType::DEFAULT );
- aToolbarItemProp[4].Value <<= nItemBits;
- aToolbarItemProp[5].Value <<= bVisible;
- aToolbarItemProp[6].Value <<= aTooltip;
-
- m_rItemContainer->insertByIndex(
m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) );
- }
+ if ( aCommandURL.getLength() > 0 )
+ {
+ Sequence< PropertyValue >
aToolbarItemProp( 7 );
+ aToolbarItemProp[0].Name =
m_aCommandURL;
+ aToolbarItemProp[1].Name = m_aHelpURL;
+ aToolbarItemProp[2].Name = m_aLabel;
+ aToolbarItemProp[3].Name = m_aType;
+ aToolbarItemProp[4].Name = m_aStyle;
+ aToolbarItemProp[5].Name = m_aIsVisible;
+ aToolbarItemProp[6].Name = m_aTooltip;
+
+ aToolbarItemProp[0].Value <<=
aCommandURL;
+ aToolbarItemProp[1].Value <<= aHelpURL;
+ aToolbarItemProp[2].Value <<= aLabel;
+ aToolbarItemProp[3].Value = makeAny(
::com::sun::star::ui::ItemType::DEFAULT );
+ aToolbarItemProp[4].Value <<= nItemBits;
+ aToolbarItemProp[5].Value <<= bVisible;
+ aToolbarItemProp[6].Value <<= aTooltip;
+
+ m_rItemContainer->insertByIndex(
m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) );
+ }
}
break;
@@ -486,12 +486,12 @@ throw( SAXException, RuntimeException )
m_bToolBarSpaceStartFound = sal_True;
- Sequence< PropertyValue > aToolbarItemProp( 2 );
- aToolbarItemProp[0].Name = m_aCommandURL;
- aToolbarItemProp[1].Name = m_aType;
+ Sequence< PropertyValue > aToolbarItemProp( 2 );
+ aToolbarItemProp[0].Name = m_aCommandURL;
+ aToolbarItemProp[1].Name = m_aType;
- aToolbarItemProp[0].Value <<= rtl::OUString();
- aToolbarItemProp[1].Value <<=
::com::sun::star::ui::ItemType::SEPARATOR_SPACE;
+ aToolbarItemProp[0].Value <<= rtl::OUString();
+ aToolbarItemProp[1].Value <<=
::com::sun::star::ui::ItemType::SEPARATOR_SPACE;
m_rItemContainer->insertByIndex(
m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) );
}
@@ -511,12 +511,12 @@ throw( SAXException, RuntimeException )
m_bToolBarBreakStartFound = sal_True;
- Sequence< PropertyValue > aToolbarItemProp( 2 );
- aToolbarItemProp[0].Name = m_aCommandURL;
- aToolbarItemProp[1].Name = m_aType;
+ Sequence< PropertyValue > aToolbarItemProp( 2 );
+ aToolbarItemProp[0].Name = m_aCommandURL;
+ aToolbarItemProp[1].Name = m_aType;
- aToolbarItemProp[0].Value <<= rtl::OUString();
- aToolbarItemProp[1].Value <<=
::com::sun::star::ui::ItemType::SEPARATOR_LINEBREAK;
+ aToolbarItemProp[0].Value <<= rtl::OUString();
+ aToolbarItemProp[1].Value <<=
::com::sun::star::ui::ItemType::SEPARATOR_LINEBREAK;
m_rItemContainer->insertByIndex(
m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) );
}
@@ -536,19 +536,19 @@ throw( SAXException, RuntimeException )
m_bToolBarSeparatorStartFound = sal_True;
- Sequence< PropertyValue > aToolbarItemProp( 2 );
- aToolbarItemProp[0].Name = m_aCommandURL;
- aToolbarItemProp[1].Name = m_aType;
+ Sequence< PropertyValue > aToolbarItemProp( 2 );
+ aToolbarItemProp[0].Name = m_aCommandURL;
+ aToolbarItemProp[1].Name = m_aType;
- aToolbarItemProp[0].Value <<= rtl::OUString();
- aToolbarItemProp[1].Value <<=
::com::sun::star::ui::ItemType::SEPARATOR_LINE;
+ aToolbarItemProp[0].Value <<= rtl::OUString();
+ aToolbarItemProp[1].Value <<=
::com::sun::star::ui::ItemType::SEPARATOR_LINE;
m_rItemContainer->insertByIndex(
m_rItemContainer->getCount(), makeAny( aToolbarItemProp ) );
}
break;
- default:
- break;
+ default:
+ break;
}
}
}
@@ -628,8 +628,8 @@ throw( SAXException, RuntimeException )
}
break;
- default:
- break;
+ default:
+ break;
}
}
}
@@ -680,13 +680,13 @@ throw( SAXException, RuntimeException )
//_________________________________________________________________________________________________________________
OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler(
- const Reference< XIndexAccess >& rItemAccess,
- Reference< XDocumentHandler >& rWriteDocumentHandler ) :
+ const Reference< XIndexAccess >& rItemAccess,
+ Reference< XDocumentHandler >& rWriteDocumentHandler ) :
ThreadHelpBase( &Application::GetSolarMutex() ),
m_xWriteDocumentHandler( rWriteDocumentHandler ),
m_rItemAccess( rItemAccess )
{
- ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
+ ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
m_xEmptyList = Reference< XAttributeList >( (XAttributeList
*) pList, UNO_QUERY );
m_aAttributeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
ATTRIBUTE_TYPE_CDATA ));
m_aXMLXlinkNS = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
XMLNS_XLINK_PREFIX ));
@@ -700,7 +700,7 @@
OWriteToolBoxDocumentHandler::~OWriteToolBoxDocumentHandler()
void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
( SAXException, RuntimeException )
{
- ResetableGuard aGuard( m_aLock );
+ ResetableGuard aGuard( m_aLock );
m_xWriteDocumentHandler->startDocument();
@@ -712,20 +712,20 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
throw
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString()
);
}
- ::rtl::OUString aUIName;
- Reference< XPropertySet > xPropSet( m_rItemAccess, UNO_QUERY );
- if ( xPropSet.is() )
- {
- try
- {
- xPropSet->getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= aUIName;
- }
- catch ( UnknownPropertyException& )
- {
- }
- }
-
- ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
+ ::rtl::OUString aUIName;
+ Reference< XPropertySet > xPropSet( m_rItemAccess, UNO_QUERY );
+ if ( xPropSet.is() )
+ {
+ try
+ {
+ xPropSet->getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "UIName" ))) >>= aUIName;
+ }
+ catch ( UnknownPropertyException& )
+ {
+ }
+ }
+
+ ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY
);
pList->AddAttribute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
ATTRIBUTE_XMLNS_TOOLBAR )),
@@ -736,40 +736,40 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
throw
m_aAttributeType,
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( XMLNS_XLINK )) );
- if ( aUIName.getLength() > 0 )
- pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_UINAME )),
- m_aAttributeType,
- aUIName );
+ if ( aUIName.getLength() > 0 )
+ pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_UINAME )),
+ m_aAttributeType,
+ aUIName );
m_xWriteDocumentHandler->startElement( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBAR )), pList );
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
- sal_Int32 nItemCount = m_rItemAccess->getCount();
- Any aAny;
+ sal_Int32 nItemCount = m_rItemAccess->getCount();
+ Any aAny;
for ( sal_Int32 nItemPos = 0; nItemPos < nItemCount; nItemPos++ )
{
- Sequence< PropertyValue > aProps;
- aAny = m_rItemAccess->getByIndex( nItemPos );
- if ( aAny >>= aProps )
- {
- ::rtl::OUString aCommandURL;
- ::rtl::OUString aLabel;
- ::rtl::OUString aHelpURL;
- ::rtl::OUString aTooltip;
- sal_Bool bVisible( sal_True );
- sal_Int16 nType( ::com::sun::star::ui::ItemType::DEFAULT );
- sal_Int16 nWidth( 0 );
- sal_Int16 nStyle( 0 );
-
- ExtractToolbarParameters( aProps, aCommandURL, aLabel, aHelpURL,
aTooltip, nStyle, nWidth, bVisible, nType );
- if ( nType == ::com::sun::star::ui::ItemType::DEFAULT )
- WriteToolBoxItem( aCommandURL, aLabel, aHelpURL, aTooltip,
nStyle, nWidth, bVisible );
- else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_SPACE
)
+ Sequence< PropertyValue > aProps;
+ aAny = m_rItemAccess->getByIndex( nItemPos );
+ if ( aAny >>= aProps )
+ {
+ ::rtl::OUString aCommandURL;
+ ::rtl::OUString aLabel;
+ ::rtl::OUString aHelpURL;
+ ::rtl::OUString aTooltip;
+ sal_Bool bVisible( sal_True );
+ sal_Int16 nType(
::com::sun::star::ui::ItemType::DEFAULT );
+ sal_Int16 nWidth( 0 );
+ sal_Int16 nStyle( 0 );
+
+ ExtractToolbarParameters( aProps, aCommandURL, aLabel,
aHelpURL, aTooltip, nStyle, nWidth, bVisible, nType );
+ if ( nType == ::com::sun::star::ui::ItemType::DEFAULT )
+ WriteToolBoxItem( aCommandURL, aLabel,
aHelpURL, aTooltip, nStyle, nWidth, bVisible );
+ else if ( nType ==
::com::sun::star::ui::ItemType::SEPARATOR_SPACE )
WriteToolBoxSpace();
- else if ( nType == ::com::sun::star::ui::ItemType::SEPARATOR_LINE )
+ else if ( nType ==
::com::sun::star::ui::ItemType::SEPARATOR_LINE )
WriteToolBoxSeparator();
- else if ( nType ==
::com::sun::star::ui::ItemType::SEPARATOR_LINEBREAK )
+ else if ( nType ==
::com::sun::star::ui::ItemType::SEPARATOR_LINEBREAK )
WriteToolBoxBreak();
}
}
@@ -785,16 +785,16 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
throw
//_________________________________________________________________________________________________________________
void OWriteToolBoxDocumentHandler::WriteToolBoxItem(
- const ::rtl::OUString& rCommandURL,
- const ::rtl::OUString& rLabel,
- const ::rtl::OUString& rHelpURL,
- const ::rtl::OUString& rTooltip,
- sal_Int16 nStyle,
- sal_Int16 nWidth,
- sal_Bool bVisible )
+ const ::rtl::OUString& rCommandURL,
+ const ::rtl::OUString& rLabel,
+ const ::rtl::OUString& rHelpURL,
+ const ::rtl::OUString& rTooltip,
+ sal_Int16 nStyle,
+ sal_Int16 nWidth,
+ sal_Bool bVisible )
throw ( SAXException, RuntimeException )
{
- ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
+ ::comphelper::AttributeList* pList = new ::comphelper::AttributeList;
Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY
);
if ( m_aAttributeURL.getLength() == 0 )
@@ -803,7 +803,7 @@ throw ( SAXException, RuntimeException )
m_aAttributeURL += ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_URL ));
}
- // save required attribute (URL)
+ // save required attribute (URL)
pList->AddAttribute( m_aAttributeURL, m_aAttributeType, rCommandURL );
if ( rLabel.getLength() > 0 )
@@ -827,38 +827,38 @@ throw ( SAXException, RuntimeException )
rHelpURL );
}
- if ( rTooltip.getLength() > 0 )
- {
- pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TOOLTIP )),
- m_aAttributeType,
- rTooltip );
- }
-
- if ( nStyle > 0 )
- {
- rtl::OUString aValue;
- ToolboxStyleItem* pStyle = Styles;
-
- for ( sal_Int32 nIndex = 0; nIndex < nStyleItemEntries; ++nIndex,
++pStyle )
- {
- if ( nStyle & pStyle->nBit )
- {
- if ( aValue.getLength() )
- aValue = aValue.concat( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(" ") ) );
- aValue += rtl::OUString::createFromAscii( pStyle->attrName );
- }
- }
- pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE )),
- m_aAttributeType,
- aValue );
- }
-
- if ( nWidth > 0 )
- {
+ if ( rTooltip.getLength() > 0 )
+ {
+ pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TOOLTIP )),
+ m_aAttributeType,
+ rTooltip );
+ }
+
+ if ( nStyle > 0 )
+ {
+ rtl::OUString aValue;
+ ToolboxStyleItem* pStyle = Styles;
+
+ for ( sal_Int32 nIndex = 0; nIndex < nStyleItemEntries;
++nIndex, ++pStyle )
+ {
+ if ( nStyle & pStyle->nBit )
+ {
+ if ( aValue.getLength() )
+ aValue = aValue.concat( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(" ") ) );
+ aValue += rtl::OUString::createFromAscii(
pStyle->attrName );
+ }
+ }
+ pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_ITEMSTYLE )),
+ m_aAttributeType,
+ aValue );
+ }
+
+ if ( nWidth > 0 )
+ {
pList->AddAttribute( m_aXMLToolbarNS + ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_WIDTH )),
m_aAttributeType,
- ::rtl::OUString::valueOf( sal_Int32( nWidth )) );
- }
+
::rtl::OUString::valueOf( sal_Int32( nWidth )) );
+ }
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
m_xWriteDocumentHandler->startElement( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARITEM )), xList );
@@ -869,7 +869,7 @@ throw ( SAXException, RuntimeException )
void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() throw
( SAXException, RuntimeException )
{
- m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
m_xWriteDocumentHandler->startElement( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARSPACE )), m_xEmptyList );
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
m_xWriteDocumentHandler->endElement( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARSPACE )) );
@@ -887,11 +887,10 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxBreak()
throw
void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator() throw
( SAXException, RuntimeException )
{
- m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
+ m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
m_xWriteDocumentHandler->startElement( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARSEPARATOR )), m_xEmptyList );
m_xWriteDocumentHandler->ignorableWhitespace( ::rtl::OUString() );
m_xWriteDocumentHandler->endElement( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_TOOLBARSEPARATOR )) );
}
} // namespace framework
-
diff --git a/main/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
b/main/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
index 2126972..b4ea928 100644
--- a/main/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
+++ b/main/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
diff --git a/main/framework/source/fwe/xml/xmlnamespaces.cxx
b/main/framework/source/fwe/xml/xmlnamespaces.cxx
index f102492..fe713f7 100644
--- a/main/framework/source/fwe/xml/xmlnamespaces.cxx
+++ b/main/framework/source/fwe/xml/xmlnamespaces.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -184,4 +184,3 @@ void XMLNamespaces::addNamespace( const ::rtl::OUString&
aName, const ::rtl::OUS
}
}
-
