[Libreoffice-commits] core.git: 5 commits - chart2/source cui/source dbaccess/source include/sfx2 include/svtools include/svx include/vcl sc/source sfx2/source svtools/source svx/source sw/qa sw/source vcl/source writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Sun Nov 16 03:37:36 PST 2014
chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx | 4 ++--
cui/source/dialogs/cuigrfflt.cxx | 2 +-
cui/source/dialogs/iconcdlg.cxx | 2 +-
cui/source/dialogs/insdlg.cxx | 2 +-
cui/source/inc/cuigrfflt.hxx | 2 +-
cui/source/inc/iconcdlg.hxx | 2 +-
cui/source/inc/insdlg.hxx | 2 +-
dbaccess/source/ui/dlg/dlgsize.cxx | 2 +-
include/sfx2/basedlgs.hxx | 8 ++++----
include/svtools/wizdlg.hxx | 2 +-
include/svx/stddlg.hxx | 2 +-
include/vcl/dialog.hxx | 4 ++--
sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx | 2 +-
sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx | 2 +-
sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx | 2 +-
sc/source/ui/inc/MatrixComparisonGenerator.hxx | 2 +-
sc/source/ui/inc/StatisticsInputOutputDialog.hxx | 2 +-
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 2 +-
sc/source/ui/inc/anyrefdg.hxx | 8 ++++----
sc/source/ui/miscdlgs/anyrefdg.cxx | 4 ++--
sc/source/ui/miscdlgs/groupdlg.cxx | 4 ++--
sc/source/ui/miscdlgs/mtrindlg.cxx | 2 +-
sfx2/source/dialog/basedlgs.cxx | 8 ++++----
svtools/source/dialogs/wizdlg.cxx | 2 +-
svx/source/dialog/stddlg.cxx | 2 +-
sw/qa/extras/rtfimport/data/fdo83204.rtf | 9 +++++++++
sw/qa/extras/rtfimport/rtfimport.cxx | 6 ++++++
sw/source/ui/dbui/customizeaddresslistdialog.cxx | 2 +-
sw/source/ui/dbui/customizeaddresslistdialog.hxx | 2 +-
sw/source/ui/dbui/mmoutputpage.cxx | 4 ++--
sw/source/ui/dialog/swmessdialog.cxx | 2 +-
sw/source/uibase/dbui/dbui.cxx | 2 +-
sw/source/uibase/inc/dbui.hxx | 2 +-
sw/source/uibase/inc/swmessdialog.hxx | 2 +-
vcl/source/window/dialog.cxx | 8 ++++----
writerfilter/source/dmapper/BorderHandler.cxx | 2 +-
writerfilter/source/dmapper/CellColorHandler.cxx | 7 +++----
writerfilter/source/dmapper/DomainMapper.cxx | 2 +-
writerfilter/source/dmapper/TDefTableHandler.cxx | 2 +-
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 ++
writerfilter/source/rtftok/rtfsdrimport.cxx | 6 +++---
41 files changed, 76 insertions(+), 60 deletions(-)
New commits:
commit 133c295bbe6f746d4c2fd2fe7560206b890cdf1f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun Nov 16 12:13:19 2014 +0100
vcl: let the ModalDialog ctor take an OUString
Change-Id: I839435338f4acf80c40896b6c86f7ef122f5449d
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 50fbc2f..2af1b5f 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -46,8 +46,8 @@ SchAxisDlg::SchAxisDlg(vcl::Window* pWindow,
const InsertAxisOrGridDialogData& rInput, bool bAxisDlg)
: ModalDialog(pWindow,
bAxisDlg ?
- OString("InsertAxisDialog") :
- OString("InsertGridDialog"),
+ OUString("InsertAxisDialog") :
+ OUString("InsertGridDialog"),
bAxisDlg ?
OUString("modules/schart/ui/insertaxisdlg.ui") :
OUString("modules/schart/ui/insertgriddlg.ui"))
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 57a853c..9eb4749 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -137,7 +137,7 @@ void GraphicPreviewWindow::Resize()
}
GraphicFilterDialog::GraphicFilterDialog(vcl::Window* pParent,
- const OString& rID, const OUString& rUIXMLDescription,
+ const OUString& rID, const OUString& rUIXMLDescription,
const Graphic& rGraphic)
: ModalDialog(pParent, rID, rUIXMLDescription)
, maModifyHdl(LINK( this, GraphicFilterDialog, ImplModifyHdl))
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 835829d..5d558c0 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -173,7 +173,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvtIconChoiceCtrl(vcl:
WB_NODRAGSELECTION | WB_TABSTOP);
}
-IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OString& rID,
+IconChoiceDialog::IconChoiceDialog ( vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription,
const SfxItemSet *pItemSet )
: ModalDialog ( pParent, rID, rUIXMLDescription ),
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 10fa996..bfe8633 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -91,7 +91,7 @@ uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified(
return uno::Reference< io::XInputStream >();
}
-InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID,
+InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OUString& rID,
const OUString& rUIXMLDescription,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage)
: ModalDialog(pParent, rID, rUIXMLDescription)
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index f4faabb..1fb1393 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -84,7 +84,7 @@ protected:
public:
- GraphicFilterDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic);
+ GraphicFilterDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, const Graphic& rGraphic);
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) = 0;
};
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 269e61d..566d4e1 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -182,7 +182,7 @@ protected :
public :
// the IconChoiceCtrl's could also be set in the Ctor
- IconChoiceDialog ( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
+ IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription,
const SfxItemSet * pItemSet = 0 );
virtual ~IconChoiceDialog ();
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index f845ea8..5307a25 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -44,7 +44,7 @@ protected:
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& m_xStorage;
comphelper::EmbeddedObjectContainer aCnt;
- InsertObjectDialog_Impl(vcl::Window * pParent, const OString& rID,
+ InsertObjectDialog_Impl(vcl::Window * pParent, const OUString& rID,
const OUString& rUIXMLDescription,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage);
public:
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index f73a1a2..11750ab 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -28,7 +28,7 @@ namespace dbaui
#define DEF_COL_WIDTH 227
DlgSize::DlgSize( vcl::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard )
- : ModalDialog(pParent, bRow ? OString("RowHeightDialog") : OString("ColWidthDialog"),
+ : ModalDialog(pParent, bRow ? OUString("RowHeightDialog") : OUString("ColWidthDialog"),
bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui"))
, m_nPrevValue(nVal)
, m_nStandard(bRow ? DEF_ROW_HEIGHT : DEF_COL_WIDTH)
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 4418303..c7fafe3 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -68,7 +68,7 @@ private:
SAL_DLLPRIVATE void init();
protected:
- SfxModalDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription);
+ SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription);
OUString& GetExtraData() { return aExtraData; }
sal_uInt32 GetUniqId() const { return nUniqId; }
@@ -179,11 +179,11 @@ class SFX2_DLLPUBLIC SfxSingleTabDialog : public SfxModalDialog
{
public:
SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rOptionsSet,
- const OString& rID = OString("SingleTabDialog"),
+ const OUString& rID = OUString("SingleTabDialog"),
const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"));
SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet* pInSet = 0,
- const OString& rID = OString("SingleTabDialog"),
+ const OUString& rID = OUString("SingleTabDialog"),
const OUString& rUIXMLDescription = OUString("sfx/ui/singletabdialog.ui"));
virtual ~SfxSingleTabDialog();
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index a4ab002..8ff5f3c 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -239,7 +239,7 @@ private:
public:
WizardDialog( vcl::Window* pParent, WinBits nStyle = WB_STDTABDIALOG );
- WizardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
+ WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
virtual ~WizardDialog();
virtual void Resize() SAL_OVERRIDE;
diff --git a/include/svx/stddlg.hxx b/include/svx/stddlg.hxx
index 9251475..85cdf46 100644
--- a/include/svx/stddlg.hxx
+++ b/include/svx/stddlg.hxx
@@ -27,7 +27,7 @@
class SVX_DLLPUBLIC SvxStandardDialog: public SfxModalDialog
{
public:
- SvxStandardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
+ SvxStandardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
virtual ~SvxStandardDialog();
short Execute() SAL_OVERRIDE;
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 73c0575..11b8625 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -139,7 +139,7 @@ class VCL_DLLPUBLIC ModalDialog : public Dialog
{
public:
explicit ModalDialog( vcl::Window* pParent, WinBits nStyle = WB_STDMODAL );
- explicit ModalDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
+ explicit ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
protected:
using Window::Show;
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index ed65fc2..f3507ffe 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -177,7 +177,7 @@ public:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
protected:
- ScRefHdlModalImpl(vcl::Window* pParent, const OString& rID,
+ ScRefHdlModalImpl(vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription);
private:
@@ -264,7 +264,7 @@ void ScRefHdlrImplBase<TWindow, bBindRef>::StateChanged( StateChangedType nState
class ScAnyRefModalDlg : public ScRefHdlModalImpl
{
public:
- ScAnyRefModalDlg(vcl::Window* pParent, const OString& rID,
+ ScAnyRefModalDlg(vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription);
};
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 59387d0..32448aa 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -1000,7 +1000,7 @@ void ScRefHandler::RefInputDone( bool bForced )
m_aHelper.RefInputDone( bForced );
}
-ScRefHdlModalImpl::ScRefHdlModalImpl(vcl::Window* pParent, const OString& rID,
+ScRefHdlModalImpl::ScRefHdlModalImpl(vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription)
: ModalDialog( pParent, rID, rUIXMLDescription)
, ScRefHandler(dynamic_cast<Window&>(*this), NULL, true)
@@ -1019,7 +1019,7 @@ void ScRefHdlModalImpl::StateChanged( StateChangedType nStateChange )
ScRefHandler::stateChanged( nStateChange, true );
}
-ScAnyRefModalDlg::ScAnyRefModalDlg(vcl::Window* pParent, const OString& rID,
+ScAnyRefModalDlg::ScAnyRefModalDlg(vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription)
: ScRefHdlModalImpl(pParent, rID, rUIXMLDescription)
{
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx
index 47de6c1..62b726b 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++ b/sc/source/ui/miscdlgs/groupdlg.cxx
@@ -25,8 +25,8 @@
ScGroupDlg::ScGroupDlg(vcl::Window* pParent, bool bUngroup, bool bRows)
: ModalDialog(pParent,
bUngroup ?
- OString("UngroupDialog") :
- OString("GroupDialog"),
+ OUString("UngroupDialog") :
+ OUString("GroupDialog"),
bUngroup ?
OUString("modules/scalc/ui/ungroupdialog.ui") :
OUString("modules/scalc/ui/groupdialog.ui"))
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index c6782d1..7651d83 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -34,7 +34,7 @@ ScMetricInputDlg::ScMetricInputDlg( vcl::Window* pParent,
long nFirst,
long nLast )
- : ModalDialog(pParent, sDialogName,
+ : ModalDialog(pParent, OStringToOUString(sDialogName, RTL_TEXTENCODING_UTF8),
OStringToOUString("modules/scalc/ui/" +
sDialogName.toAsciiLowerCase() + ".ui", RTL_TEXTENCODING_UTF8))
{
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 49fe751..07e18cb 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -152,7 +152,7 @@ void SfxModalDialog::init()
GetDialogData_Impl();
}
-SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription )
+SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription )
: ModalDialog(pParent, rID, rUIXMLDescription),
nUniqId(0), //todo: remove this member when the ResId using ctor is removed
pInputSet(0),
@@ -674,7 +674,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl)
SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& rSet,
- const OString& rID, const OUString& rUIXMLDescription)
+ const OUString& rID, const OUString& rUIXMLDescription)
: SfxModalDialog(pParent, rID, rUIXMLDescription)
, fnGetRanges(NULL)
, pImpl(new SingleTabDlgImpl)
@@ -687,7 +687,7 @@ SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window *pParent, const SfxItemSet& r
}
SfxSingleTabDialog::SfxSingleTabDialog(vcl::Window* pParent, const SfxItemSet* pInSet,
- const OString& rID, const OUString& rUIXMLDescription)
+ const OUString& rID, const OUString& rUIXMLDescription)
: SfxModalDialog(pParent, rID, rUIXMLDescription)
, fnGetRanges(NULL)
, pImpl(new SingleTabDlgImpl)
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 8b0b3d5..6a6a4b6 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -355,7 +355,7 @@ WizardDialog::WizardDialog( vcl::Window* pParent, WinBits nStyle ) :
-WizardDialog::WizardDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
+WizardDialog::WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) :
ModalDialog( pParent, rID, rUIXMLDescription )
{
ImplInitData();
diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx
index c1ba57d..d06e524 100644
--- a/svx/source/dialog/stddlg.cxx
+++ b/svx/source/dialog/stddlg.cxx
@@ -30,7 +30,7 @@ short SvxStandardDialog::Execute()
return nRet;
}
-SvxStandardDialog::SvxStandardDialog(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription )
+SvxStandardDialog::SvxStandardDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription )
: SfxModalDialog(pParent, rID, rUIXMLDescription)
{
}
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 3a83b7a..c812fcd 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -173,7 +173,7 @@ void SwCustomizeAddressListDialog::UpdateButtons()
SwAddRenameEntryDialog::SwAddRenameEntryDialog(
- vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
+ vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription,
const std::vector< OUString >& rCSVHeader)
: SfxModalDialog(pParent, rID, rUIXMLDescription)
, m_rCSVHeader(rCSVHeader)
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index 176debe..e059208 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -61,7 +61,7 @@ class SwAddRenameEntryDialog : public SfxModalDialog
DECL_LINK(ModifyHdl_Impl, Edit*);
protected:
- SwAddRenameEntryDialog(vcl::Window* pParent, const OString& rID,
+ SwAddRenameEntryDialog(vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription, const std::vector< OUString >& rCSVHeader);
public:
void SetFieldName(const OUString& rName) {m_pFieldNameED->SetText(rName);}
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 0034007..1cb5613 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -135,7 +135,7 @@ class SwSendQueryBox_Impl : public SwMessageAndEditDialog
bool bIsEmptyAllowed;
DECL_LINK( ModifyHdl, Edit*);
public:
- SwSendQueryBox_Impl(vcl::Window* pParent, const OString& rID,
+ SwSendQueryBox_Impl(vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription);
void SetValue(const OUString& rSet)
@@ -176,7 +176,7 @@ IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, Edit*, pEdit)
return 0;
}
-SwSendQueryBox_Impl::SwSendQueryBox_Impl(vcl::Window* pParent, const OString& rID,
+SwSendQueryBox_Impl::SwSendQueryBox_Impl(vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription)
: SwMessageAndEditDialog(pParent, rID, rUIXMLDescription)
, bIsEmptyAllowed(true)
diff --git a/sw/source/ui/dialog/swmessdialog.cxx b/sw/source/ui/dialog/swmessdialog.cxx
index 00d277b..2e085f4 100644
--- a/sw/source/ui/dialog/swmessdialog.cxx
+++ b/sw/source/ui/dialog/swmessdialog.cxx
@@ -15,7 +15,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/vclmedit.hxx>
-SwMessageAndEditDialog::SwMessageAndEditDialog(vcl::Window* pParent, const OString& rID,
+SwMessageAndEditDialog::SwMessageAndEditDialog(vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription)
: ModalDialog(pParent, rID, rUIXMLDescription)
{
diff --git a/sw/source/uibase/inc/swmessdialog.hxx b/sw/source/uibase/inc/swmessdialog.hxx
index 4382f57..da9c8af 100644
--- a/sw/source/uibase/inc/swmessdialog.hxx
+++ b/sw/source/uibase/inc/swmessdialog.hxx
@@ -26,7 +26,7 @@ protected:
VclMultiLineEdit* m_pSecondaryMessage;
Edit* m_pEdit;
public:
- SwMessageAndEditDialog(vcl::Window* pParent, const OString& rID,
+ SwMessageAndEditDialog(vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription);
};
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index a3002a8..99ceec2 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1163,8 +1163,8 @@ ModalDialog::ModalDialog( vcl::Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-ModalDialog::ModalDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
- Dialog(pParent, OStringToOUString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription, WINDOW_MODALDIALOG)
+ModalDialog::ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) :
+ Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODALDIALOG)
{
}
commit b04759db661f35dce41c03dfc7ad00671fc68c55
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun Nov 16 12:13:01 2014 +0100
writerfilter: this is expected to be UTF-8
Change-Id: I7408be90f1ff552f4bb33e8a89d4b9075634e3e5
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index eb09c67..632bc07 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -272,8 +272,7 @@ TablePropertyMapPtr CellColorHandler::getProperties()
: m_OutputFormat == Paragraph ? PROP_PARA_BACK_COLOR
: PROP_CHAR_BACK_COLOR, uno::makeAny( nApplyColor ));
- createGrabBag("originalColor", uno::makeAny( OStringToOUString(
- msfilter::util::ConvertColor( nApplyColor, true ), RTL_TEXTENCODING_UTF8 )));
+ createGrabBag("originalColor", uno::makeAny(OUString::fromUtf8(msfilter::util::ConvertColor(nApplyColor, true))));
return pPropertyMap;
}
commit 8a30ba573470d59dbb0501b488f8a655b015ffd2
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun Nov 16 12:12:43 2014 +0100
fdo#83204 RTF import: handle \pard<para props> after \bkmkstart
Change-Id: I4f5f0f653f2ce7782ec1d1fc5ef550a21a9c1d35
diff --git a/sw/qa/extras/rtfimport/data/fdo83204.rtf b/sw/qa/extras/rtfimport/data/fdo83204.rtf
new file mode 100644
index 0000000..39d89b0
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo83204.rtf
@@ -0,0 +1,9 @@
+{\rtf1
+{\stylesheet
+{Normal;}
+{\s1 heading 1;}
+}
+{\*\bkmkstart titlebookmark}
+\pard\s1 Title\par
+{\*\bkmkend titlebookmark}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 54334b3..6ad14b0 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2076,6 +2076,12 @@ DECLARE_RTFIMPORT_TEST(testUnbalancedColumns, "unbalanced-columns.rtf")
CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xTextSections->getByIndex(0), "DontBalanceTextColumns"));
}
+DECLARE_RTFIMPORT_TEST(testFdo83204, "fdo83204.rtf")
+{
+ // This was Standard, \sN was ignored after \bkmkstart and \pard.
+ CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"), getProperty<OUString>(getParagraph(1), "ParaStyleName"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c321111..e51e233 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2958,6 +2958,8 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().nCurrentStyleIndex = -1;
}
}
+ // Need to send paragraph properties again, if there will be any.
+ m_bNeedPap = true;
break;
case RTF_SECTD:
{
commit 7ae56e48e2a7473687657600eba7ead114983ea9
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun Nov 16 12:12:18 2014 +0100
vcl: let the ModelessDialog ctor take an OUString
Change-Id: Iae88a9889c674337fb999a23a799d8730d2793d5
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 864cf09..4418303 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -100,7 +100,7 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog
protected:
SfxModelessDialog( SfxBindings*, SfxChildWindow*,
- vcl::Window*, const OString& rID, const OUString& rUIXMLDescription );
+ vcl::Window*, const OUString& rID, const OUString& rUIXMLDescription );
virtual ~SfxModelessDialog();
virtual bool Close() SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 0636d69..73c0575 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -131,7 +131,7 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog
SAL_DLLPRIVATE ModelessDialog & operator= (const ModelessDialog &);
public:
- explicit ModelessDialog( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
+ explicit ModelessDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription );
};
// - ModalDialog -
diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
index 4ac7c8e..6bef1fd 100644
--- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
+++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
@@ -53,7 +53,7 @@ namespace
ScMatrixComparisonGenerator::ScMatrixComparisonGenerator(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- vcl::Window* pParent, ScViewData* pViewData, const OString& rID,
+ vcl::Window* pParent, ScViewData* pViewData, const OUString& rID,
const OUString& rUiXmlDescription) :
ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent, pViewData, rID, rUiXmlDescription)
{}
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index 1c104a6..cb63821 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -55,7 +55,7 @@ ScRangeList ScStatisticsInputOutputDialog::MakeRowRangeList(SCTAB aTab, ScAddres
ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) :
+ vcl::Window* pParent, ScViewData* pViewData, const OUString& rID, const OUString& rUIXMLDescription ) :
ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, rID, rUIXMLDescription ),
mViewData ( pViewData ),
mDocument ( pViewData->GetDocument() ),
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index 190704b..80da64a 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -27,7 +27,7 @@
ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
- vcl::Window* pParent, ScViewData* pViewData, const OString& rID, const OUString& rUIXMLDescription ) :
+ vcl::Window* pParent, ScViewData* pViewData, const OUString& rID, const OUString& rUIXMLDescription ) :
ScAnyRefDlg ( pSfxBindings, pChildWindow, pParent, rID, rUIXMLDescription ),
mViewData ( pViewData ),
mDocument ( pViewData->GetDocument() ),
diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
index 863a835..0fdd1ab 100644
--- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx
+++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
@@ -27,7 +27,7 @@ public:
ScMatrixComparisonGenerator(
SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
vcl::Window* pParent, ScViewData* pViewData,
- const OString& rID, const OUString& rUiXmlDescription );
+ const OUString& rID, const OUString& rUiXmlDescription );
virtual ~ScMatrixComparisonGenerator();
diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
index 1ed3e59..ce60a44 100644
--- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
+++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
@@ -30,7 +30,7 @@ public:
ScStatisticsInputOutputDialog(
SfxBindings* pB, SfxChildWindow* pCW,
vcl::Window* pParent, ScViewData* pViewData,
- const OString& rID, const OUString& rUIXMLDescription );
+ const OUString& rID, const OUString& rUIXMLDescription );
virtual ~ScStatisticsInputOutputDialog();
diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
index 960e966..682197c 100644
--- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
+++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
@@ -30,7 +30,7 @@ public:
ScStatisticsTwoVariableDialog(
SfxBindings* pB, SfxChildWindow* pCW,
vcl::Window* pParent, ScViewData* pViewData,
- const OString& rID, const OUString& rUIXMLDescription );
+ const OUString& rID, const OUString& rUIXMLDescription );
virtual ~ScStatisticsTwoVariableDialog();
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 32157a6..ed65fc2 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -197,7 +197,7 @@ private:
template<class TBindings, class TChildWindow, class TParentWindow >
ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW,
- TParentWindow* pParent, const OString& rID, const OUString& rUIXMLDescription );
+ TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription );
template<class TParentWindow, class TResId, class TArg>
ScRefHdlrImplBase( TParentWindow* pParent, TResId nResId, const TArg &rArg, SfxBindings *pB = NULL );
@@ -222,7 +222,7 @@ ScRefHdlrImplBase<TWindow, bBindRef>::ScRefHdlrImplBase( TBindings* pB, TChildWi
template<class TWindow, bool bBindRef>
template<class TBindings, class TChildWindow, class TParentWindow>
ScRefHdlrImplBase<TWindow, bBindRef>::ScRefHdlrImplBase( TBindings* pB, TChildWindow* pCW,
- TParentWindow* pParent, const OString& rID, const OUString& rUIXMLDescription )
+ TParentWindow* pParent, const OUString& rID, const OUString& rUIXMLDescription )
: TWindow(pB, pCW, pParent, rID, rUIXMLDescription )
, ScRefHandler( *static_cast<TWindow*>(this), pB, bBindRef )
{
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index dbdf8d5..49fe751 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -302,7 +302,7 @@ IMPL_LINK_NOARG(SfxModelessDialog, TimerHdl)
}
SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx,
- SfxChildWindow *pCW, vcl::Window *pParent, const OString& rID,
+ SfxChildWindow *pCW, vcl::Window *pParent, const OUString& rID,
const OUString& rUIXMLDescription)
: ModelessDialog(pParent, rID, rUIXMLDescription)
{
diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx
index 80728ef..22e5070 100644
--- a/sw/source/uibase/dbui/dbui.cxx
+++ b/sw/source/uibase/dbui/dbui.cxx
@@ -78,7 +78,7 @@ void CreateMonitor::SetCurrentPosition( sal_Int32 nCurrent )
}
CancelableModelessDialog::CancelableModelessDialog( vcl::Window *pParent,
- const OString& rID, const OUString& rUIXMLDescription )
+ const OUString& rID, const OUString& rUIXMLDescription )
: ModelessDialog( pParent , rID, rUIXMLDescription )
{
get(m_pCancelButton, "cancel");
diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx
index fdf50d0..265d03b 100644
--- a/sw/source/uibase/inc/dbui.hxx
+++ b/sw/source/uibase/inc/dbui.hxx
@@ -28,7 +28,7 @@ class SW_DLLPUBLIC CancelableModelessDialog : public ModelessDialog
{
protected:
CancelButton* m_pCancelButton;
- CancelableModelessDialog( vcl::Window *pParent, const OString& rID,
+ CancelableModelessDialog( vcl::Window *pParent, const OUString& rID,
const OUString& rUIXMLDescription );
public:
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 9489d5b..a3002a8 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1152,8 +1152,8 @@ VclBuilderContainer::~VclBuilderContainer()
delete m_pUIBuilder;
}
-ModelessDialog::ModelessDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription)
- : Dialog(pParent, OStringToOUString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription, WINDOW_MODELESSDIALOG)
+ModelessDialog::ModelessDialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription)
+ : Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODELESSDIALOG)
{
}
commit 6a499c904f20d20158fc3add18acb82ce23ee31a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sun Nov 16 12:11:58 2014 +0100
writerfilter: these are expected to be UTF-8
Change-Id: I8cd2ce341996a219ee885969de3482be422730b3
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 036b52d..2604b7a 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -67,7 +67,7 @@ void BorderHandler::lcl_attribute(Id rName, Value & rVal)
break;
case NS_ooxml::LN_CT_Border_color:
m_nLineColor = nIntValue;
- appendGrabBag("color", OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8));
+ appendGrabBag("color", OUString::fromUtf8(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true)));
break;
case NS_ooxml::LN_CT_Border_space: // border distance in points
m_nLineDistance = ConversionHelper::convertTwipToMM100( nIntValue * 20 );
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index 4b6657c..eb09c67 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -106,13 +106,13 @@ void CellColorHandler::lcl_attribute(Id rName, Value & rVal)
}
break;
case NS_ooxml::LN_CT_Shd_fill:
- createGrabBag("fill", uno::makeAny(OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8)));
+ createGrabBag("fill", uno::makeAny(OUString::fromUtf8(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true))));
if( nIntValue == OOXML_COLOR_AUTO )
nIntValue = 0xffffff; //fill color auto means white
m_nFillColor = nIntValue;
break;
case NS_ooxml::LN_CT_Shd_color:
- createGrabBag("color", uno::makeAny(OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8)));
+ createGrabBag("color", uno::makeAny(OUString::fromUtf8(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true))));
if( nIntValue == OOXML_COLOR_AUTO )
nIntValue = 0; //shading color auto means black
//color of the shading
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index e719805..c393ad9 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -277,7 +277,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
case NS_ooxml::LN_CT_Color_val:
if (m_pImpl->GetTopContext())
m_pImpl->GetTopContext()->Insert(PROP_CHAR_COLOR, uno::makeAny( nIntValue ) );
- m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "val", OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8));
+ m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag, "val", OUString::fromUtf8(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true)));
break;
case NS_ooxml::LN_CT_Underline_color:
if (m_pImpl->GetTopContext())
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index e2c32ec..ad23035 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -292,7 +292,7 @@ void TDefTableHandler::lcl_attribute(Id rName, Value & rVal)
appendGrabBag("val", TDefTableHandler::getBorderTypeString(nIntValue));
break;
case NS_ooxml::LN_CT_Border_color:
- appendGrabBag("color", OStringToOUString(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true), RTL_TEXTENCODING_UTF8));
+ appendGrabBag("color", OUString::fromUtf8(msfilter::util::ConvertColor(nIntValue, /*bAutoColor=*/true)));
m_nLineColor = nIntValue;
break;
case NS_ooxml::LN_CT_Border_space:
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index bd981f3..a123a3a 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -357,11 +357,11 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
xPropertySet->setPropertyValue("FillColor", aAny);
// fillType will decide, possible it'll be the start color of a gradient.
- aFillModel.moColor.set(OUString("#") + OStringToOUString(msfilter::util::ConvertColor(aAny.get<sal_Int32>()), RTL_TEXTENCODING_UTF8));
+ aFillModel.moColor.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(aAny.get<sal_Int32>())));
}
else if (i->first == "fillBackColor")
// fillType will decide, possible it'll be the end color of a gradient.
- aFillModel.moColor2.set(OUString("#") + OStringToOUString(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32())), RTL_TEXTENCODING_UTF8));
+ aFillModel.moColor2.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32()))));
else if (i->first == "lineColor")
aLineColor <<= msfilter::util::BGRToRGB(i->second.toInt32());
else if (i->first == "lineBackColor")
@@ -564,7 +564,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
aShadowModel.mbHasShadow = true;
}
else if (i->first == "shadowColor")
- aShadowModel.moColor.set(OUString("#") + OStringToOUString(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32())), RTL_TEXTENCODING_UTF8));
+ aShadowModel.moColor.set(OUString("#") + OUString::fromUtf8(msfilter::util::ConvertColor(msfilter::util::BGRToRGB(i->second.toInt32()))));
else if (i->first == "shadowOffsetX")
// EMUs to points
aShadowModel.moOffset.set(OUString::number(i->second.toDouble() / 12700) + "pt");
More information about the Libreoffice-commits
mailing list