Skip to content

C
core
Kaydet (Commit) 132e7c45 authored tarafından Thomas Arnhold's avatar Thomas Arnhold
Dosyalara gözat
Seçenekler

writerfilter: remove using namespace from headers 

Change-Id: Ibbb234a15de9ddb71552ef083ade72d2ac724ee0
üst 4f6e3433
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 73 deletions
writerfilter/inc/resourcemodel/TableManager.hxx
Dosyayı görüntüle @ 132e7c45
......@@ -1045,7 +1045,7 @@ void TableManager<T, PropertiesPointer>::resolveCurrentTable()
mpTableDataHandler->endTable(mTableDataStack.size() - 1);
}
catch (uno::Exception const& e)
catch (css::uno::Exception const& e)
{
(void) e;
#if OSL_DEBUG_LEVEL > 0
......
writerfilter/inc/resourcemodel/util.hxx
Dosyayı görüntüle @ 132e7c45
......@@ -19,21 +19,20 @@
#ifndef INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_UTIL_HXX
#define INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_UTIL_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <string>
namespace writerfilter
{
using namespace ::std;
using namespace ::com::sun::star;
string xmlify(const string & str);
std::string xmlify(const std::string & str);
#if OSL_DEBUG_LEVEL > 1
string toString(uno::Reference< text::XTextRange > textRange);
std::string toString(css::uno::Reference< css::text::XTextRange > textRange);
#endif
}
#endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_UTIL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
writerfilter/source/dmapper/DomainMapperTableHandler.hxx
Dosyayı görüntüle @ 132e7c45
......@@ -83,7 +83,7 @@ class DomainMapperTableHandler : public TableDataHandler<Handle_t , TablePropert
sal_Int32 m_nCellIndex;
sal_Int32 m_nRowIndex;
TableStyleSheetEntry * endTableGetTableStyle(TableInfo & rInfo, uno::Sequence<beans::PropertyValue>& rFrameProperties);
TableStyleSheetEntry * endTableGetTableStyle(TableInfo & rInfo, css::uno::Sequence<css::beans::PropertyValue>& rFrameProperties);
CellPropertyValuesSeq_t endTableGetCellProperties(TableInfo & rInfo, std::vector<HorizontallyMergedCell>& rMerges);
RowPropertyValuesSeq_t endTableGetRowProperties();
......
writerfilter/source/dmapper/DomainMapper_Impl.hxx
Dosyayı görüntüle @ 132e7c45
......@@ -181,8 +181,8 @@ struct TextAppendContext
const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >& xCur ) :
xTextAppend( xAppend )
{
xCursor.set(xCur, uno::UNO_QUERY);
xInsertPosition.set(xCursor, uno::UNO_QUERY);
xCursor.set(xCur, css::uno::UNO_QUERY);
xInsertPosition.set(xCursor, css::uno::UNO_QUERY);
}
};
......@@ -246,7 +246,7 @@ struct RedlineParams
sal_Int32 m_nToken;
/// This can hold properties of runs that had formatted 'track changes' properties
uno::Sequence<beans::PropertyValue> m_aRevertProperties;
css::uno::Sequence<css::beans::PropertyValue> m_aRevertProperties;
};
typedef boost::shared_ptr< RedlineParams > RedlineParamsPtr;
......@@ -272,19 +272,19 @@ struct LineNumberSettings
/// Contains information about a table that will be potentially converted to a floating one at the section end.
struct FloatingTableInfo
{
uno::Reference<text::XTextRange> m_xStart;
uno::Reference<text::XTextRange> m_xEnd;
uno::Sequence<beans::PropertyValue> m_aFrameProperties;
css::uno::Reference<css::text::XTextRange> m_xStart;
css::uno::Reference<css::text::XTextRange> m_xEnd;
css::uno::Sequence<css::beans::PropertyValue> m_aFrameProperties;
sal_Int32 m_nTableWidth;
FloatingTableInfo(uno::Reference<text::XTextRange> xStart, uno::Reference<text::XTextRange> xEnd, const uno::Sequence<beans::PropertyValue>& aFrameProperties, sal_Int32 nTableWidth)
FloatingTableInfo(css::uno::Reference<css::text::XTextRange> xStart, css::uno::Reference<css::text::XTextRange> xEnd, const css::uno::Sequence<css::beans::PropertyValue>& aFrameProperties, sal_Int32 nTableWidth)
: m_xStart(xStart),
m_xEnd(xEnd),
m_aFrameProperties(aFrameProperties),
m_nTableWidth(nTableWidth)
{
}
uno::Any getPropertyValue(const OUString &propertyName);
css::uno::Any getPropertyValue(const OUString &propertyName);
};
class DomainMapper;
......@@ -304,7 +304,7 @@ private:
::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xComponentContext;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xPageStyles;
::com::sun::star::uno::Reference< ::com::sun::star::text::XText > m_xBodyText;
::com::sun::star::uno::Reference<text::XTextContent> m_xEmbedded;
::com::sun::star::uno::Reference< css::text::XTextContent > m_xEmbedded;
TextAppendStack m_aTextAppendStack;
......@@ -365,9 +365,9 @@ private:
bool m_bIsCustomFtnMark;
//registered frame properties
::com::sun::star::uno::Sequence< beans::PropertyValue > m_aFrameProperties;
::com::sun::star::uno::Reference< text::XTextRange > m_xFrameStartRange;
::com::sun::star::uno::Reference< text::XTextRange > m_xFrameEndRange;
::com::sun::star::uno::Sequence< css::beans::PropertyValue > m_aFrameProperties;
::com::sun::star::uno::Reference< css::text::XTextRange > m_xFrameStartRange;
::com::sun::star::uno::Reference< css::text::XTextRange > m_xFrameEndRange;
// Redline stack
std::stack< std::vector< RedlineParamsPtr > > m_aRedlines;
......@@ -388,11 +388,11 @@ private:
bool m_bSdt;
bool m_bIsFirstRun;
uno::Reference< text::XTextCursor > xTOCMarkerCursor;
uno::Reference< text::XTextCursor > mxTOCTextCursor;
css::uno::Reference< css::text::XTextCursor > xTOCMarkerCursor;
css::uno::Reference< css::text::XTextCursor > mxTOCTextCursor;
//annotation import
uno::Reference< beans::XPropertySet > m_xAnnotationField;
css::uno::Reference< css::beans::XPropertySet > m_xAnnotationField;
sal_Int32 m_nAnnotationId;
AnnotationPositions_t m_aAnnotationPositions;
......@@ -414,10 +414,10 @@ private:
public:
DomainMapper_Impl(
DomainMapper& rDMapper,
uno::Reference < uno::XComponentContext > xContext,
uno::Reference< lang::XComponent > xModel,
css::uno::Reference < css::uno::XComponentContext > xContext,
css::uno::Reference< css::lang::XComponent > xModel,
SourceDocumentType eDocumentType,
uno::Reference< text::XTextRange > xInsertTextRange,
css::uno::Reference< css::text::XTextRange > xInsertTextRange,
bool bIsNewDoc );
virtual ~DomainMapper_Impl();
......@@ -440,7 +440,7 @@ public:
{
return m_xTextDocument;
}
void SetDocumentSettingsProperty( const OUString& rPropName, const uno::Any& rValue );
void SetDocumentSettingsProperty( const OUString& rPropName, const css::uno::Any& rValue );
void CreateRedline( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xRange, RedlineParamsPtr& pRedline );
......@@ -481,7 +481,7 @@ public:
void finishParagraph( PropertyMapPtr pPropertyMap );
void appendTextPortion( const OUString& rString, PropertyMapPtr pPropertyMap );
void appendTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >,
const uno::Sequence< beans::PropertyValue >& );
const css::uno::Sequence< css::beans::PropertyValue >& );
void appendOLE( const OUString& rStreamName, OLEHandlerPtr pOleHandler );
void appendStarMath( const Value& v );
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > appendTextSectionAfter(
......@@ -580,36 +580,36 @@ public:
void handleFieldAsk
(FieldContextPtr pContext,
PropertyNameSupplier& rPropNameSupplier,
uno::Reference< uno::XInterface > & xFieldInterface,
uno::Reference< beans::XPropertySet > xFieldProperties);
css::uno::Reference< css::uno::XInterface > & xFieldInterface,
css::uno::Reference< css::beans::XPropertySet > xFieldProperties);
void handleAutoNum
(FieldContextPtr pContext,
PropertyNameSupplier& rPropNameSupplier,
uno::Reference< uno::XInterface > & xFieldInterface,
uno::Reference< beans::XPropertySet > xFieldProperties);
css::uno::Reference< css::uno::XInterface > & xFieldInterface,
css::uno::Reference< css::beans::XPropertySet > xFieldProperties);
void handleAuthor
(OUString const& rFirstParam,
PropertyNameSupplier& rPropNameSupplier,
uno::Reference< uno::XInterface > & xFieldInterface,
uno::Reference< beans::XPropertySet > xFieldProperties,
css::uno::Reference< css::uno::XInterface > & xFieldInterface,
css::uno::Reference< css::beans::XPropertySet > xFieldProperties,
FieldId eFieldId);
void handleDocProperty
(FieldContextPtr pContext,
OUString const& rFirstParam,
PropertyNameSupplier& rPropNameSupplier,
uno::Reference< uno::XInterface > & xFieldInterface,
uno::Reference< beans::XPropertySet > xFieldProperties);
css::uno::Reference< css::uno::XInterface > & xFieldInterface,
css::uno::Reference< css::beans::XPropertySet > xFieldProperties);
void handleToc
(FieldContextPtr pContext,
PropertyNameSupplier& rPropNameSupplier,
uno::Reference< uno::XInterface > & xFieldInterface,
uno::Reference< beans::XPropertySet > xFieldProperties,
css::uno::Reference< css::uno::XInterface > & xFieldInterface,
css::uno::Reference< css::beans::XPropertySet > xFieldProperties,
const OUString & sTOCServiceName);
void handleIndex
(FieldContextPtr pContext,
PropertyNameSupplier& rPropNameSupplier,
uno::Reference< uno::XInterface > & xFieldInterface,
uno::Reference< beans::XPropertySet > xFieldProperties,
css::uno::Reference< css::uno::XInterface > & xFieldInterface,
css::uno::Reference< css::beans::XPropertySet > xFieldProperties,
const OUString & sTOCServiceName);
void handleBibliography
......@@ -701,7 +701,7 @@ public:
void SetCurrentRedlineDate( const OUString& sDate );
void SetCurrentRedlineId( sal_Int32 nId );
void SetCurrentRedlineToken( sal_Int32 nToken );
void SetCurrentRedlineRevertProperties( const uno::Sequence<beans::PropertyValue>& aProperties );
void SetCurrentRedlineRevertProperties( const css::uno::Sequence<css::beans::PropertyValue>& aProperties );
void RemoveCurrentRedline( );
void ResetParaMarkerRedline( );
void SetCurrentRedlineInitials( const OUString& sInitials );
......@@ -762,8 +762,8 @@ public:
std::vector<FloatingTableInfo> m_aPendingFloatingTables;
/// Append a property to a sub-grabbag if necessary (e.g. 'lineRule', 'auto')
void appendGrabBag(std::vector<beans::PropertyValue>& rInteropGrabBag, const OUString& aKey, const OUString& aValue);
void appendGrabBag(std::vector<beans::PropertyValue>& rInteropGrabBag, const OUString& aKey, std::vector<beans::PropertyValue>& rValue);
void appendGrabBag(std::vector<css::beans::PropertyValue>& rInteropGrabBag, const OUString& aKey, const OUString& aValue);
void appendGrabBag(std::vector<css::beans::PropertyValue>& rInteropGrabBag, const OUString& aKey, std::vector<css::beans::PropertyValue>& rValue);
/// Enable, disable an check status of grabbags
void enableInteropGrabBag(const OUString& aName);
......@@ -774,10 +774,10 @@ public:
OUString m_aInteropGrabBagName;
/// A toplevel dmapper grabbag, like 'pPr'.
std::vector<beans::PropertyValue> m_aInteropGrabBag;
std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
/// A sub-grabbag of m_aInteropGrabBag, like 'spacing'.
std::vector<beans::PropertyValue> m_aSubInteropGrabBag;
std::vector<css::beans::PropertyValue> m_aSubInteropGrabBag;
/// ST_PositivePercentage values we received
std::queue<OUString> m_aPositivePercentages;
......@@ -791,7 +791,7 @@ public:
private:
void PushPageHeaderFooter(bool bHeader, SectionPropertyMap::PageType eType);
std::vector<uno::Reference< drawing::XShape > > m_vTextFramesForChaining ;
std::vector<css::uno::Reference< css::drawing::XShape > > m_vTextFramesForChaining ;
};
} //namespace dmapper
} //namespace writerfilter
......
writerfilter/source/dmapper/StyleSheetTable.hxx
Dosyayı görüntüle @ 132e7c45
......@@ -50,7 +50,7 @@ enum StyleType
struct StyleSheetTable_Impl;
class StyleSheetEntry
{
std::vector<beans::PropertyValue> m_aInteropGrabBag;
std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
public:
OUString sStyleIdentifierI;
OUString sStyleIdentifierD;
......@@ -64,13 +64,13 @@ public:
OUString sStyleName1;
PropertyMapPtr pProperties;
OUString sConvertedStyleName;
std::vector<beans::PropertyValue> aLatentStyles; ///< Attributes of latentStyles
std::vector<beans::PropertyValue> aLsdExceptions; ///< List of lsdException attribute lists
std::vector<css::beans::PropertyValue> aLatentStyles; ///< Attributes of latentStyles
std::vector<css::beans::PropertyValue> aLsdExceptions; ///< List of lsdException attribute lists
bool bAutoRedefine; ///< Writer calls this auto-update.
void AppendInteropGrabBag(beans::PropertyValue aValue);
beans::PropertyValue GetInteropGrabBag(); ///< Used for table styles, has a name.
beans::PropertyValues GetInteropGrabBagSeq(); ///< Used for existing styles, just a list of properties.
void AppendInteropGrabBag(css::beans::PropertyValue aValue);
css::beans::PropertyValue GetInteropGrabBag(); ///< Used for table styles, has a name.
css::beans::PropertyValues GetInteropGrabBagSeq(); ///< Used for existing styles, just a list of properties.
StyleSheetEntry();
virtual ~StyleSheetEntry();
......
writerfilter/source/dmapper/TablePropertiesHandler.hxx
Dosyayı görüntüle @ 132e7c45
......@@ -39,9 +39,9 @@ typedef TableManager<Handle_t , TablePropertyMapPtr > DomainMapperTableManager_B
class TablePropertiesHandler
{
private:
vector< PropertyMapPtr > m_rPropertiesStack;
std::vector< PropertyMapPtr > m_rPropertiesStack;
PropertyMapPtr m_pCurrentProperties;
std::vector<beans::PropertyValue>* m_pCurrentInteropGrabBag;
std::vector<css::beans::PropertyValue>* m_pCurrentInteropGrabBag;
DomainMapperTableManager_Base_t *m_pTableManager;
bool m_bOOXML;
......@@ -61,7 +61,7 @@ public:
m_pCurrentProperties = pProperties;
};
void SetInteropGrabBag(std::vector<beans::PropertyValue>& rValue);
void SetInteropGrabBag(std::vector<css::beans::PropertyValue>& rValue);
private:
......
writerfilter/source/dmapper/TblStylePrHandler.cxx
Dosyayı görüntüle @ 132e7c45
......@@ -25,6 +25,8 @@
#include "dmapperLoggers.hxx"
using namespace css;
namespace writerfilter {
namespace dmapper {
......
writerfilter/source/dmapper/TblStylePrHandler.hxx
Dosyayı görüntüle @ 132e7c45
......@@ -57,7 +57,7 @@ private:
TblStyleType m_nType;
PropertyMapPtr m_pProperties;
std::vector<beans::PropertyValue> m_aInteropGrabBag;
std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
// Properties
virtual void lcl_attribute(Id Name, Value & val) SAL_OVERRIDE;
......@@ -71,7 +71,7 @@ public:
inline TblStyleType getType() { return m_nType; };
OUString getTypeString();
void appendInteropGrabBag(const OUString& aKey, const OUString& aValue);
beans::PropertyValue getInteropGrabBag(const OUString& aName);
css::beans::PropertyValue getInteropGrabBag(const OUString& aName);
private:
......
writerfilter/source/resourcemodel/TagLogger.cxx
Dosyayı görüntüle @ 132e7c45
......@@ -24,6 +24,8 @@
#include <resourcemodel/QNameToString.hxx>
#include <boost/unordered_map.hpp>
using namespace css;
namespace writerfilter
{
TagLogger::TagLogger(const char* name)
......@@ -38,12 +40,12 @@ namespace writerfilter
}
#ifdef DEBUG_IMPORT
void TagLogger::setFileName( const string & filename )
void TagLogger::setFileName( const std::string & filename )
{
if ( pWriter )
endDocument();
string fileName;
std::string fileName;
char * temp = getenv("TAGLOGGERTMP");
if (temp != NULL)
......@@ -51,7 +53,7 @@ namespace writerfilter
else
fileName += "/tmp";
string sPrefix = filename;
std::string sPrefix = filename;
size_t nLastSlash = sPrefix.find_last_of('/');
size_t nLastBackslash = sPrefix.find_last_of('\\');
size_t nCutPos = nLastSlash;
......@@ -87,19 +89,19 @@ namespace writerfilter
TagLogger::Pointer_t TagLogger::getInstance(const char * name)
{
typedef boost::unordered_map<string, TagLogger::Pointer_t> TagLoggerHashMap_t;
typedef boost::unordered_map<std::string, TagLogger::Pointer_t> TagLoggerHashMap_t;
static TagLoggerHashMap_t tagLoggers;
TagLoggerHashMap_t::iterator aIt = tagLoggers.end();
string sName = name;
std::string sName = name;
if (! tagLoggers.empty())
aIt = tagLoggers.find(sName);
if (aIt == tagLoggers.end())
{
TagLogger::Pointer_t pTagLogger(new TagLogger(name));
pair<string, TagLogger::Pointer_t> entry(sName, pTagLogger);
std::pair<std::string, TagLogger::Pointer_t> entry(sName, pTagLogger);
aIt = tagLoggers.insert(entry).first;
}
......@@ -107,7 +109,7 @@ namespace writerfilter
}
#ifdef DEBUG_DOMAINMAPPER
void TagLogger::element(const string & name)
void TagLogger::element(const std::string & name)
{
startElement(name);
endElement();
......@@ -148,7 +150,7 @@ namespace writerfilter
#endif
#if OSL_DEBUG_LEVEL > 1
void TagLogger::startElement(const string & name)
void TagLogger::startElement(const std::string & name)
{
xmlChar* xmlName = xmlCharStrdup( name.c_str() );
xmlTextWriterStartElement( pWriter, xmlName );
......@@ -156,7 +158,7 @@ namespace writerfilter
}
#endif
void TagLogger::attribute(const string & name, const string & value)
void TagLogger::attribute(const std::string & name, const std::string & value)
{
xmlChar* xmlName = xmlCharStrdup( name.c_str() );
xmlChar* xmlValue = xmlCharStrdup( value.c_str() );
......@@ -167,12 +169,12 @@ namespace writerfilter
}
#if OSL_DEBUG_LEVEL > 1
void TagLogger::attribute(const string & name, const OUString & value)
void TagLogger::attribute(const std::string & name, const OUString & value)
{
attribute( name, OUStringToOString( value, RTL_TEXTENCODING_ASCII_US ).getStr() );
}
void TagLogger::attribute(const string & name, sal_uInt32 value)
void TagLogger::attribute(const std::string & name, sal_uInt32 value)
{
xmlChar* xmlName = xmlCharStrdup( name.c_str() );
xmlTextWriterWriteFormatAttribute( pWriter, xmlName,
......@@ -180,11 +182,11 @@ namespace writerfilter
xmlFree( xmlName );
}
void TagLogger::attribute(const string & name, const uno::Any aAny)
void TagLogger::attribute(const std::string & name, const uno::Any aAny)
{
string aTmpStrInt;
string aTmpStrFloat;
string aTmpStrString;
std::string aTmpStrInt;
std::string aTmpStrFloat;
std::string aTmpStrString;
sal_Int32 nInt = 0;
float nFloat = 0.0;
......@@ -208,7 +210,7 @@ namespace writerfilter
xmlFree( xmlName );
}
void TagLogger::chars(const string & rChars)
void TagLogger::chars(const std::string & rChars)
{
xmlChar* xmlChars = xmlCharStrdup( rChars.c_str() );
xmlTextWriterWriteString( pWriter, xmlChars );
......@@ -277,7 +279,7 @@ namespace writerfilter
{
m_pLogger->startElement( "sprm" );
string sName;
std::string sName;
if (mpIdToString != IdToString::Pointer_t())
sName = mpIdToString->toString(rSprm.getId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment