summaryrefslogtreecommitdiff
path: root/writerfilter/source
diff options
context:
space:
mode:
Diffstat (limited to 'writerfilter/source')
-rw-r--r--writerfilter/source/dmapper/LatentStyleHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/SdtHelper.cxx6
-rw-r--r--writerfilter/source/dmapper/SdtHelper.hxx4
-rw-r--r--writerfilter/source/dmapper/TablePositionHandler.hxx2
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx15
-rw-r--r--writerfilter/source/rtftok/rtftokenizer.hxx4
6 files changed, 15 insertions, 18 deletions
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx
index d2aecb0eceed..8b1a697a6255 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -33,7 +33,7 @@ public:
LatentStyleHandler();
virtual ~LatentStyleHandler();
- com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getAttributes() const;
+ css::uno::Sequence<css::beans::PropertyValue> getAttributes() const;
};
typedef std::shared_ptr<LatentStyleHandler> LatentStyleHandlerPtr;
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index ff6bae8c26f7..2d0a240cdb45 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -169,14 +169,14 @@ void SdtHelper::createControlShape(awt::Size aSize, uno::Reference<awt::XControl
m_bHasElements = true;
}
-void SdtHelper::appendToInteropGrabBag(const com::sun::star::beans::PropertyValue& rValue)
+void SdtHelper::appendToInteropGrabBag(const beans::PropertyValue& rValue)
{
m_aGrabBag.push_back(rValue);
}
-com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> SdtHelper::getInteropGrabBagAndClear()
+uno::Sequence<beans::PropertyValue> SdtHelper::getInteropGrabBagAndClear()
{
- com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> aRet = comphelper::containerToSequence(m_aGrabBag);
+ uno::Sequence<beans::PropertyValue> aRet = comphelper::containerToSequence(m_aGrabBag);
m_aGrabBag.clear();
return aRet;
}
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx
index 52576d79f521..28bd0591696c 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -114,8 +114,8 @@ public:
/// Create date control from w:sdt's w:date.
void createDateControl(OUString& rContentText, const css::beans::PropertyValue& rCharFormat);
- void appendToInteropGrabBag(const com::sun::star::beans::PropertyValue& rValue);
- com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getInteropGrabBagAndClear();
+ void appendToInteropGrabBag(const css::beans::PropertyValue& rValue);
+ css::uno::Sequence<css::beans::PropertyValue> getInteropGrabBagAndClear();
bool isInteropGrabBagEmpty();
bool containedInInteropGrabBag(const OUString& rValueName);
sal_Int32 getInteropGrabBagSize();
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index 95ff5cd065a6..cdb239f7b711 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -89,7 +89,7 @@ public:
Note that the properties will need to be adjusted with the table
properties before actually using them.
*/
- com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getTablePosition() const;
+ css::uno::Sequence<css::beans::PropertyValue> getTablePosition() const;
bool operator== (const TablePositionHandler& rHandler) const;
};
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 75f3858b4fa7..d931d6d15c75 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4149,31 +4149,28 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
switch (nParam)
{
case 1:
- m_aStates.top().aShape.nWrap = com::sun::star::text::WrapTextMode_NONE;
+ m_aStates.top().aShape.nWrap = css::text::WrapTextMode_NONE;
break;
case 2:
- m_aStates.top().aShape.nWrap = com::sun::star::text::WrapTextMode_PARALLEL;
+ m_aStates.top().aShape.nWrap = css::text::WrapTextMode_PARALLEL;
break;
case 3:
- m_aStates.top().aShape.nWrap = com::sun::star::text::WrapTextMode_THROUGHT;
+ m_aStates.top().aShape.nWrap = css::text::WrapTextMode_THROUGHT;
m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_WrapType_wrapNone, std::make_shared<RTFValue>());
break;
case 4:
- m_aStates.top().aShape.nWrap = com::sun::star::text::WrapTextMode_PARALLEL;
+ m_aStates.top().aShape.nWrap = css::text::WrapTextMode_PARALLEL;
m_aStates.top().aCharacterSprms.set(NS_ooxml::LN_EG_WrapType_wrapTight, std::make_shared<RTFValue>());
break;
case 5:
- m_aStates.top().aShape.nWrap = com::sun::star::text::WrapTextMode_THROUGHT;
+ m_aStates.top().aShape.nWrap = css::text::WrapTextMode_THROUGHT;
break;
}
}
break;
case RTF_CELLX:
{
- int& rCurrentCellX((Destination::NESTEDTABLEPROPERTIES ==
- m_aStates.top().eDestination)
- ? m_nNestedCurrentCellX
- : m_nTopLevelCurrentCellX);
+ int& rCurrentCellX((Destination::NESTEDTABLEPROPERTIES == m_aStates.top().eDestination) ? m_nNestedCurrentCellX : m_nTopLevelCurrentCellX);
int nCellX = nParam - rCurrentCellX;
const int COL_DFLT_WIDTH = 41; // sw/source/filter/inc/wrtswtbl.hxx, minimal possible width of cells.
if (!nCellX)
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx
index 2be4e7775767..2fc8d0315687 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -27,7 +27,7 @@ namespace rtftok
class RTFTokenizer
{
public:
- RTFTokenizer(RTFListener& rImport, SvStream* pInStream, com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const& xStatusIndicator);
+ RTFTokenizer(RTFListener& rImport, SvStream* pInStream, css::uno::Reference<css::task::XStatusIndicator> const& xStatusIndicator);
virtual ~RTFTokenizer();
RTFError resolveParse();
@@ -58,7 +58,7 @@ private:
RTFListener& m_rImport;
SvStream* m_pInStream;
- com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const& m_xStatusIndicator;
+ css::uno::Reference<css::task::XStatusIndicator> const& m_xStatusIndicator;
// This is the same as aRTFControlWords, but sorted
static std::vector<RTFSymbol> m_aRTFControlWords;
static bool m_bControlWordsSorted;
generated by cgit (git 2.34.1) at 2024-07-03 20:48:11 +0000