summaryrefslogtreecommitdiff
path: root/xmloff/source/forms
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-07-02 13:58:52 +0200
committerLuboš Luňák <l.lunak@suse.cz>2012-12-10 14:46:45 +0100
commitac893720de5b0815d57b87ae5f9a08764df08a93 (patch)
tree794ade123885ba7d4f3889a3b2d7507103ec42d2 /xmloff/source/forms
parent6a71f121bd4b1ab5567fdb07a048715c4fd38097 (diff)
PCH for xmloff, including LO headers
Change-Id: I50e8eb58ef9b764cfb847b36b4e42f95bc437233
Diffstat (limited to 'xmloff/source/forms')
-rw-r--r--xmloff/source/forms/attriblistmerge.cxx18
-rw-r--r--xmloff/source/forms/formenums.cxx7
-rw-r--r--xmloff/source/forms/formlayerimport.cxx4
-rw-r--r--xmloff/source/forms/gridcolumnproptranslator.cxx13
-rw-r--r--xmloff/source/forms/layerimport.cxx4
5 files changed, 24 insertions, 22 deletions
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx
index 3e73761a7ce3..8d74287dd640 100644
--- a/xmloff/source/forms/attriblistmerge.cxx
+++ b/xmloff/source/forms/attriblistmerge.cxx
@@ -25,13 +25,13 @@ namespace xmloff
//.........................................................................
using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::xml;
+ using namespace ::com::sun::star;
//=====================================================================
//= OAttribListMerger
//=====================================================================
//---------------------------------------------------------------------
- void OAttribListMerger::addList(const Reference< sax::XAttributeList >& _rxList)
+ void OAttribListMerger::addList(const Reference< xml::sax::XAttributeList >& _rxList)
{
OSL_ENSURE(_rxList.is(), "OAttribListMerger::addList: invalid list!");
if (_rxList.is())
@@ -39,7 +39,7 @@ namespace xmloff
}
//---------------------------------------------------------------------
- sal_Bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
+ sal_Bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
{
sal_Int16 nLeftOver = _nGlobalIndex;
ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin();
@@ -60,7 +60,7 @@ namespace xmloff
}
//---------------------------------------------------------------------
- sal_Bool OAttribListMerger::seekToName(const ::rtl::OUString& _rName, Reference< sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
+ sal_Bool OAttribListMerger::seekToName(const ::rtl::OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex)
{
for ( ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin();
aLookupSublist != m_aLists.end();
@@ -93,7 +93,7 @@ namespace xmloff
//---------------------------------------------------------------------
::rtl::OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) throw(RuntimeException)
{
- Reference< sax::XAttributeList > xSubList;
+ Reference< xml::sax::XAttributeList > xSubList;
sal_Int16 nLocalIndex;
if (!seekToIndex(i, xSubList, nLocalIndex))
@@ -105,7 +105,7 @@ namespace xmloff
//---------------------------------------------------------------------
::rtl::OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) throw(RuntimeException)
{
- Reference< sax::XAttributeList > xSubList;
+ Reference< xml::sax::XAttributeList > xSubList;
sal_Int16 nLocalIndex;
if (!seekToIndex(i, xSubList, nLocalIndex))
@@ -117,7 +117,7 @@ namespace xmloff
//---------------------------------------------------------------------
::rtl::OUString SAL_CALL OAttribListMerger::getTypeByName( const ::rtl::OUString& _rName ) throw(RuntimeException)
{
- Reference< sax::XAttributeList > xSubList;
+ Reference< xml::sax::XAttributeList > xSubList;
sal_Int16 nLocalIndex;
if (!seekToName(_rName, xSubList, nLocalIndex))
@@ -131,7 +131,7 @@ namespace xmloff
//---------------------------------------------------------------------
::rtl::OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) throw(RuntimeException)
{
- Reference< sax::XAttributeList > xSubList;
+ Reference< xml::sax::XAttributeList > xSubList;
sal_Int16 nLocalIndex;
if (!seekToIndex(i, xSubList, nLocalIndex))
@@ -143,7 +143,7 @@ namespace xmloff
//---------------------------------------------------------------------
::rtl::OUString SAL_CALL OAttribListMerger::getValueByName( const ::rtl::OUString& _rName ) throw(RuntimeException)
{
- Reference< sax::XAttributeList > xSubList;
+ Reference< xml::sax::XAttributeList > xSubList;
sal_Int16 nLocalIndex;
if (!seekToName(_rName, xSubList, nLocalIndex))
diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx
index c285269df78b..d68de5cc4db4 100644
--- a/xmloff/source/forms/formenums.cxx
+++ b/xmloff/source/forms/formenums.cxx
@@ -44,6 +44,7 @@ namespace xmloff
using namespace ::com::sun::star::form;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::awt;
+ using namespace ::com::sun::star;
using namespace ::xmloff::token;
const SvXMLEnumMapEntry* OEnumMapper::s_pEnumMap[OEnumMapper::KNOWN_ENUM_PROPERTIES] =
@@ -187,9 +188,9 @@ namespace xmloff
{
static SvXMLEnumMapEntry aTextAlignMap[] =
{
- { XML_START, TextAlign::LEFT },
- { XML_CENTER, TextAlign::CENTER },
- { XML_END, TextAlign::RIGHT },
+ { XML_START, awt::TextAlign::LEFT },
+ { XML_CENTER, awt::TextAlign::CENTER },
+ { XML_END, awt::TextAlign::RIGHT },
{ XML_JUSTIFY, (sal_uInt16)-1 },
{ XML_JUSTIFIED, (sal_uInt16)-1 },
{ XML_TOKEN_INVALID, 0 }
diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx
index 741d318188e8..c9e06a012145 100644
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -30,7 +30,7 @@ namespace xmloff
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::drawing;
- using namespace ::com::sun::star::xml;
+ using namespace ::com::sun::star;
//=====================================================================
//= OFormLayerXMLExport
@@ -84,7 +84,7 @@ namespace xmloff
//---------------------------------------------------------------------
SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const rtl::OUString& _rLocalName,
- const Reference< sax::XAttributeList >& _rxAttribs)
+ const Reference< xml::sax::XAttributeList >& _rxAttribs)
{
return m_pImpl->createContext(_nPrefix, _rLocalName, _rxAttribs);
}
diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx
index d20d05514f22..f9f2e8ddca45 100644
--- a/xmloff/source/forms/gridcolumnproptranslator.cxx
+++ b/xmloff/source/forms/gridcolumnproptranslator.cxx
@@ -34,6 +34,7 @@ namespace xmloff
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
+ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::style;
@@ -74,12 +75,12 @@ namespace xmloff
// note that order matters:
// valueAlignToParaAdjust and valueParaAdjustToAlign search this map from the _beginning_
// and use the first matching entry
- { ParagraphAdjust_LEFT, TextAlign::LEFT },
- { ParagraphAdjust_CENTER, TextAlign::CENTER },
- { ParagraphAdjust_RIGHT, TextAlign::RIGHT },
- { ParagraphAdjust_BLOCK, TextAlign::RIGHT },
- { ParagraphAdjust_STRETCH, TextAlign::LEFT },
- { ParagraphAdjust_MAKE_FIXED_SIZE, TextAlign::LEFT },
+ { ParagraphAdjust_LEFT, awt::TextAlign::LEFT },
+ { ParagraphAdjust_CENTER, awt::TextAlign::CENTER },
+ { ParagraphAdjust_RIGHT, awt::TextAlign::RIGHT },
+ { ParagraphAdjust_BLOCK, awt::TextAlign::RIGHT },
+ { ParagraphAdjust_STRETCH, awt::TextAlign::LEFT },
+ { ParagraphAdjust_MAKE_FIXED_SIZE, awt::TextAlign::LEFT },
{ ParagraphAdjust_MAKE_FIXED_SIZE, -1 }
};
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index d45ed57fcf89..af8bb19ed9ed 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -67,7 +67,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::xml;
+using namespace ::com::sun::star;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::form;
using namespace ::com::sun::star::sdb;
@@ -505,7 +505,7 @@ SvXMLImportContext* OFormLayerXMLImport_Impl::createOfficeFormsContext(
//---------------------------------------------------------------------
SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nPrefix, const rtl::OUString& _rLocalName,
- const Reference< sax::XAttributeList >&)
+ const Reference< xml::sax::XAttributeList >&)
{
SvXMLImportContext* pContext = NULL;
if ( 0 == _rLocalName.compareToAscii( "form" ) )