diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-12 14:53:28 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-18 14:23:50 +0200 |
commit | fb14be5f8f74f83ba89e15f891ddf1f753dcc62f (patch) | |
tree | beaa4af08b0c3d75bf6e40b21b96c55e0ac1c60a /cui/source/inc/pastedlg.hxx | |
parent | b8ce52aab9459773544f1696cfe6b7b6f171a389 (diff) |
create new 'enum class' SotClipboardFormatId to unify types
of which there are several.
There are some issues here I am unsure of
- the SW and SC and CHART2 modules essentially ignore the enum values and assign their own ids
Perhaps I should change them to use the common values and create new enum values where necessary?
- the sc/qa/ and sq/qa/ and starmath/qa/ code was doing some dodgy stuff. I translated the code to pass down the stuff
numeric values to the underlying code, but perhaps further fixing is necessary?
Change-Id: Ic06d723e404481e3f1bca67c43b70321b764d923
Diffstat (limited to 'cui/source/inc/pastedlg.hxx')
-rw-r--r-- | cui/source/inc/pastedlg.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index c7b815f764cb..52332ac398ed 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -42,7 +42,7 @@ class SvPasteObjectDialog : public ModalDialog FixedText* m_pFtObjectSource; ListBox* m_pLbInsertList; OKButton* m_pOKButton; - ::std::map< SotFormatStringId, OUString > aSupplementMap; + ::std::map< SotClipboardFormatId, OUString > aSupplementMap; SvGlobalName aObjClassName; OUString aObjName; @@ -57,9 +57,9 @@ public: SvPasteObjectDialog( vcl::Window* pParent ); virtual ~SvPasteObjectDialog(); - void Insert( SotFormatStringId nFormat, const OUString & rFormatName ); + void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ); void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ); - sal_uLong GetFormat( const TransferableDataHelper& aHelper, + SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper, const DataFlavorExVector* pFormats=0, const TransferableObjectDescriptor* pDesc=0 ); }; |