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 /basctl/source | |
| 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 'basctl/source')
| -rw-r--r-- | basctl/source/basicide/basdoc.cxx | 2 | ||||
| -rw-r--r-- | basctl/source/basicide/basdoc.hxx | 2 | ||||
| -rw-r--r-- | basctl/source/basicide/baside2.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index d11bf03d9129..bb58c0943230 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -69,7 +69,7 @@ void DocShell::SetPrinter( SfxPrinter* pPr ) pPrinter.reset(pPr); } -void DocShell::FillClass( SvGlobalName*, sal_uInt32*, OUString*, OUString*, OUString*, sal_Int32, bool bTemplate) const +void DocShell::FillClass( SvGlobalName*, SotClipboardFormatId*, OUString*, OUString*, OUString*, sal_Int32, bool bTemplate) const { (void)bTemplate; DBG_ASSERT( !bTemplate, "No template for Basic" ); diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx index f86bff421e75..bb7393b15ef6 100644 --- a/basctl/source/basicide/basdoc.hxx +++ b/basctl/source/basicide/basdoc.hxx @@ -39,7 +39,7 @@ protected: virtual void Draw( OutputDevice *, const JobSetup & rSetup, sal_uInt16 nAspect = ASPECT_CONTENT ) SAL_OVERRIDE; virtual void FillClass( SvGlobalName * pClassName, - sal_uInt32 * pFormat, + SotClipboardFormatId * pFormat, OUString * pAppName, OUString * pFullTypeName, OUString * pShortTypeName, diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 35ddb67cf5df..eb9ef96c4326 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -1412,7 +1412,7 @@ bool ModulWindow::IsPasteAllowed() if ( xTransf.is() ) { datatransfer::DataFlavor aFlavor; - SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor ); + SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aFlavor ); if ( xTransf->isDataFlavorSupported( aFlavor ) ) bPaste = true; } |