[Libreoffice-commits] core.git: 5 commits - accessibility/source basctl/source chart2/source cui/source dbaccess/source dtrans/source editeng/source extensions/source filter/qa filter/source forms/source hwpfilter/qa include/sfx2 include/sot include/svl include/svtools include/svx include/unotest lotuswordpro/qa oox/source package/qa reportdesign/source sc/qa sc/source sd/qa sd/source sfx2/source sot/qa sot/source starmath/inc starmath/qa starmath/source svl/source svl/unx svtools/source svx/source sw/inc sw/qa sw/source unotest/source vcl/qa vcl/source writerfilter/qa writerperfect/qa
Noel Grandin
noel at peralex.com
Wed Mar 18 05:24:23 PDT 2015
accessibility/source/standard/vclxaccessibleedit.cxx | 2
basctl/source/basicide/basdoc.cxx | 2
basctl/source/basicide/basdoc.hxx | 2
basctl/source/basicide/baside2.cxx | 2
chart2/source/controller/main/ChartController_Tools.cxx | 20
chart2/source/controller/main/ChartDropTargetHelper.cxx | 6
chart2/source/controller/main/ChartTransferable.cxx | 20
chart2/source/controller/main/ChartTransferable.hxx | 2
cui/source/dialogs/colorpicker.cxx | 2
cui/source/dialogs/hltpbase.cxx | 4
cui/source/dialogs/pastedlg.cxx | 20
cui/source/factory/dlgfact.cxx | 4
cui/source/factory/dlgfact.hxx | 4
cui/source/inc/pastedlg.hxx | 6
cui/source/tabpages/autocdlg.cxx | 2
dbaccess/source/ui/app/AppController.cxx | 16
dbaccess/source/ui/app/AppController.hxx | 4
dbaccess/source/ui/app/AppControllerDnD.cxx | 10
dbaccess/source/ui/app/AppControllerGen.cxx | 4
dbaccess/source/ui/browser/brwctrlr.cxx | 2
dbaccess/source/ui/browser/dbexchange.cxx | 20
dbaccess/source/ui/browser/sbagrid.cxx | 13
dbaccess/source/ui/control/FieldDescControl.cxx | 2
dbaccess/source/ui/inc/JoinExchange.hxx | 2
dbaccess/source/ui/inc/TableCopyHelper.hxx | 13
dbaccess/source/ui/inc/TableRowExchange.hxx | 2
dbaccess/source/ui/inc/dbexchange.hxx | 2
dbaccess/source/ui/misc/TableCopyHelper.cxx | 40
dbaccess/source/ui/querydesign/JoinExchange.cxx | 10
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 4
dbaccess/source/ui/tabledesign/TEditControl.cxx | 10
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 12
dtrans/source/win32/ftransl/ftransl.cxx | 234 -
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/eeobj.cxx | 18
editeng/source/editeng/impedit.cxx | 4
editeng/source/editeng/impedit2.cxx | 6
extensions/source/bibliography/framectr.cxx | 2
filter/qa/cppunit/filters-dxf-test.cxx | 4
filter/qa/cppunit/filters-eps-test.cxx | 4
filter/qa/cppunit/filters-met-test.cxx | 4
filter/qa/cppunit/filters-pcd-test.cxx | 4
filter/qa/cppunit/filters-pcx-test.cxx | 4
filter/qa/cppunit/filters-pict-test.cxx | 4
filter/qa/cppunit/filters-ppm-test.cxx | 4
filter/qa/cppunit/filters-psd-test.cxx | 4
filter/qa/cppunit/filters-ras-test.cxx | 4
filter/qa/cppunit/filters-tga-test.cxx | 4
filter/qa/cppunit/filters-tiff-test.cxx | 4
filter/source/msfilter/msdffimp.cxx | 10
filter/source/msfilter/msoleexp.cxx | 2
filter/source/msfilter/viscache.hxx | 30
forms/source/richtext/clipboarddispatcher.cxx | 6
hwpfilter/qa/cppunit/test_hwpfilter.cxx | 4
include/sfx2/docfilt.hxx | 9
include/sfx2/fcontnr.hxx | 2
include/sfx2/linkmgr.hxx | 2
include/sfx2/lnkbase.hxx | 6
include/sfx2/objsh.hxx | 2
include/sfx2/sfxdlg.hxx | 4
include/sot/exchange.hxx | 42
include/sot/formats.hxx | 303 +-
include/sot/stg.hxx | 20
include/sot/storage.hxx | 7
include/sot/storinfo.hxx | 5
include/svl/svdde.hxx | 14
include/svtools/brwbox.hxx | 4
include/svtools/inetimg.hxx | 5
include/svtools/insdlg.hxx | 4
include/svtools/openfiledroptargetlistener.hxx | 2
include/svtools/transfer.hxx | 50
include/svx/clipfmtitem.hxx | 7
include/svx/dbaexchange.hxx | 6
include/svx/dbaobjectex.hxx | 2
include/svx/galmisc.hxx | 2
include/unotest/filters-test.hxx | 9
lotuswordpro/qa/cppunit/test_lotuswordpro.cxx | 4
oox/source/ole/olehelper.cxx | 2
package/qa/cppunit/test_package.cxx | 4
reportdesign/source/ui/dlg/GroupExchange.cxx | 10
reportdesign/source/ui/dlg/GroupExchange.hxx | 2
reportdesign/source/ui/inc/dlgedclip.hxx | 2
reportdesign/source/ui/report/dlgedclip.cxx | 12
sc/qa/unit/filters-test.cxx | 4
sc/qa/unit/helper/qahelper.cxx | 20
sc/qa/unit/helper/qahelper.hxx | 4
sc/qa/unit/opencl-test.cxx | 4
sc/qa/unit/subsequent_export-test.cxx | 8
sc/qa/unit/subsequent_filters-test.cxx | 10
sc/qa/unit/ucalc.cxx | 2
sc/source/core/tool/ddelink.cxx | 8
sc/source/filter/excel/excel.cxx | 2
sc/source/ui/app/drwtrans.cxx | 86
sc/source/ui/app/lnktrans.cxx | 12
sc/source/ui/app/seltrans.cxx | 74
sc/source/ui/app/transobj.cxx | 58
sc/source/ui/docshell/arealink.cxx | 2
sc/source/ui/docshell/docsh.cxx | 12
sc/source/ui/docshell/docsh4.cxx | 8
sc/source/ui/docshell/externalrefmgr.cxx | 2
sc/source/ui/docshell/impex.cxx | 56
sc/source/ui/docshell/servobj.cxx | 4
sc/source/ui/docshell/tablink.cxx | 4
sc/source/ui/drawfunc/drtxtob.cxx | 20
sc/source/ui/drawfunc/drtxtob1.cxx | 10
sc/source/ui/inc/docsh.hxx | 2
sc/source/ui/inc/drwtrans.hxx | 2
sc/source/ui/inc/impex.hxx | 12
sc/source/ui/inc/transobj.hxx | 2
sc/source/ui/inc/viewfunc.hxx | 8
sc/source/ui/vba/vbahelper.cxx | 2
sc/source/ui/view/cellsh.cxx | 76
sc/source/ui/view/cellsh1.cxx | 26
sc/source/ui/view/cellsh2.cxx | 4
sc/source/ui/view/editsh.cxx | 30
sc/source/ui/view/gridwin.cxx | 248 -
sc/source/ui/view/tabvwshb.cxx | 2
sc/source/ui/view/viewfun3.cxx | 164 -
sc/source/ui/view/viewfun4.cxx | 14
sc/source/ui/view/viewfun5.cxx | 98
sd/qa/unit/filters-test.cxx | 4
sd/qa/unit/sdmodeltestbase.hxx | 12
sd/source/core/pglink.cxx | 2
sd/source/filter/eppt/eppt.cxx | 2
sd/source/ui/app/sdxfer.cxx | 66
sd/source/ui/dlg/sdtreelb.cxx | 20
sd/source/ui/docshell/docshel4.cxx | 10
sd/source/ui/func/fuinsert.cxx | 38
sd/source/ui/func/fuinsfil.cxx | 24
sd/source/ui/func/fuoltext.cxx | 2
sd/source/ui/func/fupoor.cxx | 2
sd/source/ui/inc/DrawDocShell.hxx | 2
sd/source/ui/inc/View.hxx | 3
sd/source/ui/inc/sdtreelb.hxx | 4
sd/source/ui/inc/sdxfer.hxx | 2
sd/source/ui/slidesorter/controller/SlsClipboard.cxx | 2
sd/source/ui/view/drviews4.cxx | 12
sd/source/ui/view/drviews7.cxx | 29
sd/source/ui/view/drviewse.cxx | 20
sd/source/ui/view/outlnvsh.cxx | 14
sd/source/ui/view/sdview2.cxx | 48
sd/source/ui/view/sdview3.cxx | 128
sd/source/ui/view/tabcontr.cxx | 2
sfx2/source/appl/appdde.cxx | 2
sfx2/source/appl/fileobj.cxx | 18
sfx2/source/appl/impldde.cxx | 33
sfx2/source/appl/linkmgr2.cxx | 13
sfx2/source/appl/lnkbase2.cxx | 20
sfx2/source/bastyp/fltfnc.cxx | 8
sfx2/source/dialog/templdlg.cxx | 6
sfx2/source/doc/docfilt.cxx | 12
sfx2/source/doc/objembed.cxx | 2
sfx2/source/doc/objstor.cxx | 84
sfx2/source/doc/templatedlg.cxx | 2
sot/qa/cppunit/test_sot.cxx | 4
sot/source/base/exchange.cxx | 408 +-
sot/source/base/filelist.cxx | 2
sot/source/base/formats.cxx | 1740 ++++++------
sot/source/sdstor/stg.cxx | 9
sot/source/sdstor/stgole.cxx | 5
sot/source/sdstor/stgole.hxx | 8
sot/source/sdstor/storage.cxx | 61
sot/source/sdstor/storinfo.cxx | 24
sot/source/sdstor/ucbstorage.cxx | 86
starmath/inc/document.hxx | 2
starmath/qa/extras/mmlimport-test.cxx | 2
starmath/source/document.cxx | 6
starmath/source/mathtype.cxx | 2
starmath/source/view.cxx | 18
svl/source/svdde/ddedata.cxx | 12
svl/source/svdde/ddesvr.cxx | 2
svl/unx/source/svdde/ddedummy.cxx | 10
svtools/source/brwbox/brwbox2.cxx | 4
svtools/source/contnr/treelistbox.cxx | 8
svtools/source/dialogs/insdlg.cxx | 144
svtools/source/misc/embedtransfer.cxx | 20
svtools/source/misc/openfiledroptargetlistener.cxx | 10
svtools/source/misc/stringtransfer.cxx | 10
svtools/source/misc/transfer.cxx | 172 -
svtools/source/misc/transfer2.cxx | 63
svtools/source/urlobj/inetimg.cxx | 14
svx/source/dialog/imapwnd.cxx | 4
svx/source/fmcomp/dbaexchange.cxx | 98
svx/source/fmcomp/dbaobjectex.cxx | 16
svx/source/fmcomp/xmlexchg.cxx | 6
svx/source/form/filtnav.cxx | 8
svx/source/form/fmexch.cxx | 30
svx/source/form/fmtextcontrolshell.cxx | 2
svx/source/gallery2/galbrws2.cxx | 24
svx/source/gallery2/galmisc.cxx | 38
svx/source/gallery2/galtheme.cxx | 34
svx/source/inc/filtnav.hxx | 2
svx/source/inc/fmexch.hxx | 8
svx/source/items/clipfmtitem.cxx | 10
svx/source/mnuctrls/clipboardctl.cxx | 2
svx/source/svdraw/svdograf.cxx | 2
svx/source/svdraw/svdoole2.cxx | 2
svx/source/svdraw/svdotxln.cxx | 2
svx/source/tbxctrls/colrctrl.cxx | 10
sw/inc/IDocumentSettingAccess.hxx | 128
sw/inc/PostItMgr.hxx | 2
sw/inc/SidebarWindowsTypes.hxx | 16
sw/inc/accmap.hxx | 42
sw/inc/docsh.hxx | 2
sw/inc/fesh.hxx | 3
sw/inc/globdoc.hxx | 2
sw/inc/postithelper.hxx | 2
sw/inc/swbaslnk.hxx | 2
sw/inc/wdocsh.hxx | 2
sw/qa/core/filters-test.cxx | 20
sw/qa/core/uwriter.cxx | 2
sw/source/core/access/acccontext.cxx | 8
sw/source/core/access/acccontext.hxx | 4
sw/source/core/access/accmap.cxx | 48
sw/source/core/crsr/crbm.cxx | 2
sw/source/core/crsr/pam.cxx | 2
sw/source/core/doc/DocumentDeviceManager.cxx | 26
sw/source/core/doc/DocumentDrawModelManager.cxx | 2
sw/source/core/doc/DocumentSettingManager.cxx | 198 -
sw/source/core/doc/DocumentStylePoolManager.cxx | 12
sw/source/core/doc/doc.cxx | 6
sw/source/core/doc/docglbl.cxx | 8
sw/source/core/doc/doclay.cxx | 2
sw/source/core/doc/docnew.cxx | 4
sw/source/core/doc/doctxm.cxx | 2
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/doc/swserv.cxx | 5
sw/source/core/doc/tblrwcl.cxx | 4
sw/source/core/docnode/ndtbl.cxx | 2
sw/source/core/docnode/section.cxx | 17
sw/source/core/docnode/swbaslnk.cxx | 2
sw/source/core/draw/dview.cxx | 2
sw/source/core/edit/edfld.cxx | 4
sw/source/core/edit/edglbldc.cxx | 20
sw/source/core/fields/ddefld.cxx | 6
sw/source/core/frmedt/fecopy.cxx | 8
sw/source/core/frmedt/feshview.cxx | 2
sw/source/core/graphic/ndgrf.cxx | 4
sw/source/core/layout/anchoreddrawobject.cxx | 2
sw/source/core/layout/anchoredobject.cxx | 4
sw/source/core/layout/calcmove.cxx | 6
sw/source/core/layout/flowfrm.cxx | 14
sw/source/core/layout/fly.cxx | 2
sw/source/core/layout/flycnt.cxx | 2
sw/source/core/layout/flyincnt.cxx | 2
sw/source/core/layout/flylay.cxx | 2
sw/source/core/layout/frmtool.cxx | 10
sw/source/core/layout/layact.cxx | 2
sw/source/core/layout/newfrm.cxx | 2
sw/source/core/layout/objectformatter.cxx | 2
sw/source/core/layout/pagechg.cxx | 14
sw/source/core/layout/paintfrm.cxx | 6
sw/source/core/layout/sectfrm.cxx | 4
sw/source/core/layout/tabfrm.cxx | 14
sw/source/core/layout/trvlfrm.cxx | 2
sw/source/core/layout/wsfrm.cxx | 10
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 4
sw/source/core/ole/ndole.cxx | 4
sw/source/core/swg/SwXMLTextBlocks.cxx | 2
sw/source/core/swg/SwXMLTextBlocks1.cxx | 6
sw/source/core/text/atrstck.cxx | 2
sw/source/core/text/guess.cxx | 2
sw/source/core/text/inftxt.cxx | 8
sw/source/core/text/itradj.cxx | 4
sw/source/core/text/itratr.cxx | 2
sw/source/core/text/itrcrsr.cxx | 8
sw/source/core/text/itrform2.cxx | 8
sw/source/core/text/porfld.cxx | 2
sw/source/core/text/porlay.cxx | 2
sw/source/core/text/portxt.cxx | 2
sw/source/core/text/txtfld.cxx | 6
sw/source/core/text/txtfly.cxx | 12
sw/source/core/text/txtfrm.cxx | 12
sw/source/core/text/txttab.cxx | 14
sw/source/core/txtnode/fntcache.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 12
sw/source/core/txtnode/swfont.cxx | 6
sw/source/core/txtnode/txtedt.cxx | 2
sw/source/core/view/viewimp.cxx | 4
sw/source/core/view/viewsh.cxx | 48
sw/source/core/view/vnew.cxx | 2
sw/source/filter/basflt/iodetect.cxx | 10
sw/source/filter/basflt/shellio.cxx | 12
sw/source/filter/html/css1atr.cxx | 4
sw/source/filter/html/swhtml.cxx | 8
sw/source/filter/html/wrthtml.cxx | 14
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/docxexport.cxx | 4
sw/source/filter/ww8/wrtw8esh.cxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 4
sw/source/filter/ww8/wrtww8.cxx | 12
sw/source/filter/ww8/ww8atr.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 60
sw/source/filter/ww8/ww8par6.cxx | 2
sw/source/filter/xml/swxml.cxx | 4
sw/source/filter/xml/xmlexp.cxx | 8
sw/source/filter/xml/xmlfonte.cxx | 4
sw/source/filter/xml/xmlimp.cxx | 2
sw/source/ui/config/optcomp.cxx | 22
sw/source/ui/config/optpage.cxx | 4
sw/source/ui/dialog/uiregionsw.cxx | 6
sw/source/uibase/app/appopt.cxx | 2
sw/source/uibase/app/docsh.cxx | 60
sw/source/uibase/app/docsh2.cxx | 14
sw/source/uibase/app/docshini.cxx | 16
sw/source/uibase/app/docst.cxx | 6
sw/source/uibase/app/docstyle.cxx | 8
sw/source/uibase/dbui/dbtree.cxx | 2
sw/source/uibase/dochdl/swdtflvr.cxx | 516 +--
sw/source/uibase/docvw/PageBreakWin.cxx | 4
sw/source/uibase/docvw/PostItMgr.cxx | 46
sw/source/uibase/docvw/SidebarWin.cxx | 20
sw/source/uibase/docvw/edtdd.cxx | 6
sw/source/uibase/docvw/edtwin.cxx | 4
sw/source/uibase/globdoc/globdoc.cxx | 6
sw/source/uibase/inc/edtwin.hxx | 6
sw/source/uibase/inc/swdtflvr.hxx | 22
sw/source/uibase/shells/annotsh.cxx | 26
sw/source/uibase/shells/basesh.cxx | 10
sw/source/uibase/shells/frmsh.cxx | 2
sw/source/uibase/shells/textsh1.cxx | 2
sw/source/uibase/uiview/swcli.cxx | 2
sw/source/uibase/uiview/view.cxx | 6
sw/source/uibase/uiview/view2.cxx | 4
sw/source/uibase/uiview/viewtab.cxx | 2
sw/source/uibase/uno/SwXDocumentSettings.cxx | 180 -
sw/source/uibase/utlui/content.cxx | 4
sw/source/uibase/utlui/glbltree.cxx | 22
sw/source/uibase/utlui/navipi.cxx | 36
sw/source/uibase/web/wdocsh.cxx | 6
sw/source/uibase/wrtsh/wrtsh1.cxx | 2
unotest/source/cpp/filters-test.cxx | 4
vcl/qa/cppunit/graphicfilter/filters-test.cxx | 4
vcl/source/app/unohelp2.cxx | 10
vcl/source/control/edit.cxx | 6
vcl/source/edit/textview.cxx | 18
writerfilter/qa/cppunittests/rtftok/testrtftok.cxx | 4
writerperfect/qa/unit/WpftImportTestBase.cxx | 2
writerperfect/qa/unit/WpftImportTestBase.hxx | 2
339 files changed, 4138 insertions(+), 4102 deletions(-)
New commits:
commit fb14be5f8f74f83ba89e15f891ddf1f753dcc62f
Author: Noel Grandin <noel at peralex.com>
Date: Thu Mar 12 14:53:28 2015 +0200
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
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx
index b52bf85..1cce874 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -519,7 +519,7 @@ sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoun
if ( xDataObj.is() )
{
datatransfer::DataFlavor aFlavor;
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aFlavor );
if ( xDataObj->isDataFlavorSupported( aFlavor ) )
{
Any aData = xDataObj->getTransferData( aFlavor );
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index d11bf03..bb58c09 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 f86bff4..bb7393b 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 35ddb67..eb9ef96 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;
}
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index d7544c8..259cb38 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -260,10 +260,10 @@ void ChartController::executeDispatch_Paste()
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( m_pChartWindow ));
if( aDataHelper.GetTransferable().is())
{
- if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING ) )
+ if ( aDataHelper.HasFormat( SotClipboardFormatId::DRAWING ) )
{
SotStorageStreamRef xStm;
- if ( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_DRAWING, xStm ) )
+ if ( aDataHelper.GetSotStorageStream( SotClipboardFormatId::DRAWING, xStm ) )
{
xStm->Seek( 0 );
Reference< io::XInputStream > xInputStream( new utl::OInputStreamWrapper( *xStm ) );
@@ -274,31 +274,31 @@ void ChartController::executeDispatch_Paste()
}
}
}
- else if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVXB ) )
+ else if ( aDataHelper.HasFormat( SotClipboardFormatId::SVXB ) )
{
// graphic exchange format (graphic manager bitmap format?)
SotStorageStreamRef xStm;
- if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_SVXB, xStm ))
+ if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::SVXB, xStm ))
ReadGraphic( *xStm, aGraphic );
}
- else if( aDataHelper.HasFormat( FORMAT_GDIMETAFILE ))
+ else if( aDataHelper.HasFormat( SotClipboardFormatId::GDIMETAFILE ))
{
// meta file
GDIMetaFile aMetafile;
- if( aDataHelper.GetGDIMetaFile( FORMAT_GDIMETAFILE, aMetafile ))
+ if( aDataHelper.GetGDIMetaFile( SotClipboardFormatId::GDIMETAFILE, aMetafile ))
aGraphic = Graphic( aMetafile );
}
- else if( aDataHelper.HasFormat( FORMAT_BITMAP ))
+ else if( aDataHelper.HasFormat( SotClipboardFormatId::BITMAP ))
{
// bitmap (non-graphic-manager)
BitmapEx aBmpEx;
- if( aDataHelper.GetBitmapEx( FORMAT_BITMAP, aBmpEx ))
+ if( aDataHelper.GetBitmapEx( SotClipboardFormatId::BITMAP, aBmpEx ))
aGraphic = Graphic( aBmpEx );
}
- else if( aDataHelper.HasFormat( FORMAT_STRING ))
+ else if( aDataHelper.HasFormat( SotClipboardFormatId::STRING ))
{
OUString aString;
- if( aDataHelper.GetString( FORMAT_STRING, aString ) && m_pDrawModelWrapper )
+ if( aDataHelper.GetString( SotClipboardFormatId::STRING, aString ) && m_pDrawModelWrapper )
{
if( m_pDrawViewWrapper )
{
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 0857de3..d9722c1 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -82,7 +82,7 @@ sal_Int8 ChartDropTargetHelper::AcceptDrop( const AcceptDropEvent& rEvt )
if( ( rEvt.mnAction == DND_ACTION_COPY ||
rEvt.mnAction == DND_ACTION_MOVE ) &&
satisfiesPrerequisites() &&
- IsDropFormatSupported( SOT_FORMATSTR_ID_LINK ) )
+ IsDropFormatSupported( SotClipboardFormatId::LINK ) )
{
// @todo: check if the data is suitable. Is this possible without XTransferable?
nResult = rEvt.mnAction;
@@ -101,9 +101,9 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
satisfiesPrerequisites())
{
TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable );
- if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_LINK ))
+ if( aDataHelper.HasFormat( SotClipboardFormatId::LINK ))
{
- Sequence<sal_Int8> aBytes = aDataHelper.GetSequence(SOT_FORMATSTR_ID_LINK, OUString());
+ Sequence<sal_Int8> aBytes = aDataHelper.GetSequence(SotClipboardFormatId::LINK, OUString());
if (aBytes.getLength())
{
::std::vector< OUString > aStrings( lcl_getStringsFromByteSequence( aBytes ));
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index e46796e..d5584d7 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -30,7 +30,7 @@
#include <svx/unomodel.hxx>
#include <svx/svdview.hxx>
-#define CHARTTRANSFER_OBJECTTYPE_DRAWMODEL 1
+#define CHARTTRANSFER_OBJECTTYPE_DRAWMODEL SotClipboardFormatId::STRING
using namespace ::com::sun::star;
@@ -66,30 +66,30 @@ void ChartTransferable::AddSupportedFormats()
{
if ( m_bDrawing )
{
- AddFormat( SOT_FORMATSTR_ID_DRAWING );
+ AddFormat( SotClipboardFormatId::DRAWING );
}
- AddFormat( SOT_FORMAT_GDIMETAFILE );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
}
bool ChartTransferable::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
{
- sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
+ SotClipboardFormatId nFormat = SotExchange::GetFormat( rFlavor );
bool bResult = false;
if( HasFormat( nFormat ))
{
- if ( nFormat == SOT_FORMATSTR_ID_DRAWING )
+ if ( nFormat == SotClipboardFormatId::DRAWING )
{
bResult = SetObject( m_pMarkedObjModel, CHARTTRANSFER_OBJECTTYPE_DRAWMODEL, rFlavor );
}
- else if ( nFormat == FORMAT_GDIMETAFILE )
+ else if ( nFormat == SotClipboardFormatId::GDIMETAFILE )
{
Graphic aGraphic( m_xMetaFileGraphic );
bResult = SetGDIMetaFile( aGraphic.GetGDIMetaFile(), rFlavor );
}
- else if( nFormat == FORMAT_BITMAP )
+ else if( nFormat == SotClipboardFormatId::BITMAP )
{
Graphic aGraphic( m_xMetaFileGraphic );
bResult = SetBitmapEx( aGraphic.GetBitmapEx(), rFlavor );
@@ -99,7 +99,7 @@ bool ChartTransferable::GetData( const css::datatransfer::DataFlavor& rFlavor, c
return bResult;
}
-bool ChartTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
+bool ChartTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
const datatransfer::DataFlavor& /* rFlavor */ )
{
// called from SetObject, put data into stream
diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx
index 3c54689..5ebf319 100644
--- a/chart2/source/controller/main/ChartTransferable.hxx
+++ b/chart2/source/controller/main/ChartTransferable.hxx
@@ -44,7 +44,7 @@ protected:
// implementation of TransferableHelper methods
virtual void AddSupportedFormats() SAL_OVERRIDE;
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
- virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
+ virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
private:
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 843347b..13fe8351 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -219,7 +219,7 @@ void HexColorControl::Paste()
if ( xDataObj.is() )
{
::com::sun::star::datatransfer::DataFlavor aFlavor;
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aFlavor );
try
{
::com::sun::star::uno::Any aData = xDataObj->getTransferData( aFlavor );
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index ec4a270..c8e4683 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -48,7 +48,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHyperURLBox(vcl::Wi
sal_Int8 SvxHyperURLBox::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
{
- return IsDropFormatSupported( FORMAT_STRING ) ? DND_ACTION_COPY : DND_ACTION_NONE;
+ return IsDropFormatSupported( SotClipboardFormatId::STRING ) ? DND_ACTION_COPY : DND_ACTION_NONE;
}
sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
@@ -57,7 +57,7 @@ sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
OUString aString;
sal_Int8 nRet = DND_ACTION_NONE;
- if( aDataHelper.GetString( FORMAT_STRING, aString ) )
+ if( aDataHelper.GetString( SotClipboardFormatId::STRING, aString ) )
{
SetText( aString );
nRet = DND_ACTION_COPY;
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 0ce111f..a7478f5 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -86,28 +86,28 @@ SvPasteObjectDialog::~SvPasteObjectDialog()
/*************************************************************************
|* SvPasteObjectDialog::Insert()
*************************************************************************/
-void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const OUString& rFormatName )
+void SvPasteObjectDialog::Insert( SotClipboardFormatId nFormat, const OUString& rFormatName )
{
aSupplementMap.insert( ::std::make_pair( nFormat, rFormatName ) );
}
-sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
+SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
const DataFlavorExVector* pFormats,
const TransferableObjectDescriptor* )
{
//TODO/LATER: why is the Descriptor never used?!
TransferableObjectDescriptor aDesc;
- if (rHelper.HasFormat(SOT_FORMATSTR_ID_OBJECTDESCRIPTOR))
+ if (rHelper.HasFormat(SotClipboardFormatId::OBJECTDESCRIPTOR))
{
(void)const_cast<TransferableDataHelper&>(rHelper).GetTransferableObjectDescriptor(
- SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aDesc);
+ SotClipboardFormatId::OBJECTDESCRIPTOR, aDesc);
}
if ( !pFormats )
pFormats = &rHelper.GetDataFlavorExVector();
// create and fill dialog box
OUString aSourceName, aTypeName;
- sal_uLong nSelFormat = 0;
+ SotClipboardFormatId nSelFormat = SotClipboardFormatId::NONE;
SvGlobalName aEmptyNm;
ObjectLB().SetUpdateMode( false );
@@ -117,9 +117,9 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
while( aIter != aEnd )
{
::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter );
- SotFormatStringId nFormat = (*aIter++).mnSotId;
+ SotClipboardFormatId nFormat = (*aIter++).mnSotId;
- ::std::map< SotFormatStringId, OUString >::iterator itName =
+ ::std::map< SotClipboardFormatId, OUString >::iterator itName =
aSupplementMap.find( nFormat );
// if there is an "Embed Source" or and "Embedded Object" on the
@@ -143,7 +143,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
{
aName = *pName;
- if( SOT_FORMATSTR_ID_EMBED_SOURCE == nFormat )
+ if( SotClipboardFormatId::EMBED_SOURCE == nFormat )
{
if( aDesc.maClassName != aEmptyNm )
{
@@ -155,7 +155,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
aName = aTypeName = aDesc.maTypeName;
}
}
- else if( SOT_FORMATSTR_ID_LINK_SOURCE == nFormat )
+ else if( SotClipboardFormatId::LINK_SOURCE == nFormat )
{
continue;
}
@@ -201,7 +201,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
if( Dialog::Execute() == RET_OK )
{
- nSelFormat = reinterpret_cast<sal_uLong>(ObjectLB().GetSelectEntryData());
+ nSelFormat = static_cast<SotClipboardFormatId>(reinterpret_cast<sal_uLong>(ObjectLB().GetSelectEntryData()));
}
return nSelFormat;
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 062d67e..f2f368a 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -391,7 +391,7 @@ bool AbstractInsertObjectDialog_Impl::IsCreateNew()
return pDlg->GetIconIfIconified( pGraphicMediaType );
}
-void AbstractPasteDialog_Impl::Insert( SotFormatStringId nFormat, const OUString & rFormatName )
+void AbstractPasteDialog_Impl::Insert( SotClipboardFormatId nFormat, const OUString & rFormatName )
{
pDlg->Insert( nFormat, rFormatName );
}
@@ -401,7 +401,7 @@ void AbstractPasteDialog_Impl::SetObjName( const SvGlobalName & rClass, const OU
pDlg->SetObjName( rClass, rObjName );
}
-sal_uLong AbstractPasteDialog_Impl::GetFormat( const TransferableDataHelper& aHelper,
+SotClipboardFormatId AbstractPasteDialog_Impl::GetFormat( const TransferableDataHelper& aHelper,
const DataFlavorExVector* pFormats,
const TransferableObjectDescriptor* pDesc )
{
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index da68f13..ffb1577 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -458,9 +458,9 @@ class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog
{
public:
DECL_ABSTDLG_BASE(AbstractPasteDialog_Impl, SvPasteObjectDialog )
- virtual void Insert( SotFormatStringId nFormat, const OUString & rFormatName ) SAL_OVERRIDE;
+ virtual void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ) SAL_OVERRIDE;
virtual void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ) SAL_OVERRIDE;
- virtual sal_uLong GetFormat( const TransferableDataHelper& aHelper,
+ virtual SotClipboardFormatId GetFormat( const TransferableDataHelper& aHelper,
const DataFlavorExVector* pFormats=0,
const TransferableObjectDescriptor* pDesc=0 ) SAL_OVERRIDE;
};
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index c7b815f..52332ac 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 );
};
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 849faa8..95ecf05 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2313,7 +2313,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const
nEncode));
sData.append(aLineEnd);
}
- pCntnr->CopyByteString( SOT_FORMAT_STRING, sData.makeStringAndClear() );
+ pCntnr->CopyByteString( SotClipboardFormatId::STRING, sData.makeStringAndClear() );
pCntnr->CopyToClipboard( (vcl::Window*)this );
}
}
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index cfbb3a9..618237e 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -598,7 +598,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = !isDataSourceReadOnly() && !isConnectionReadOnly() && isTableFormat();
break;
case E_QUERY:
- aReturn.bEnabled = !isDataSourceReadOnly() && getViewClipboard().HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY);
+ aReturn.bEnabled = !isDataSourceReadOnly() && getViewClipboard().HasFormat(SotClipboardFormatId::DBACCESS_QUERY);
break;
default:
aReturn.bEnabled = !isDataSourceReadOnly() && OComponentTransferable::canExtractComponentDescriptor(getViewClipboard().GetDataFlavorExVector(),getContainer()->getElementType() == E_FORM);
@@ -1033,7 +1033,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
break;
case E_QUERY:
- if ( rTransferData.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) )
+ if ( rTransferData.HasFormat(SotClipboardFormatId::DBACCESS_QUERY) )
paste( E_QUERY, ODataAccessObjectTransferable::extractObjectDescriptor( rTransferData ) );
break;
default:
@@ -1064,11 +1064,11 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
{
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
::std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( getView() ));
- ::std::vector<SotFormatStringId> aFormatIds;
+ ::std::vector<SotClipboardFormatId> aFormatIds;
getSupportedFormats(getContainer()->getElementType(),aFormatIds);
- const ::std::vector<SotFormatStringId>::iterator aEnd = aFormatIds.end();
+ const ::std::vector<SotClipboardFormatId>::iterator aEnd = aFormatIds.end();
OUString sEmpty;
- for (::std::vector<SotFormatStringId>::iterator aIter = aFormatIds.begin();aIter != aEnd; ++aIter)
+ for (::std::vector<SotClipboardFormatId>::iterator aIter = aFormatIds.begin();aIter != aEnd; ++aIter)
pDlg->Insert(*aIter,sEmpty);
const TransferableDataHelper& rClipboard = getViewClipboard();
@@ -1082,9 +1082,9 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
{
if ( pIter->Name == "FormatStringId" )
{
- SotFormatStringId nFormatId = 0;
- if ( pIter->Value >>= nFormatId )
- pasteFormat(nFormatId);
+ sal_uLong nTmp;
+ if ( pIter->Value >>= nTmp )
+ pasteFormat(static_cast<SotClipboardFormatId>(nTmp));
break;
}
}
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 42237ce..17ac7e8 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -259,7 +259,7 @@ namespace dbaui
@param _nFormatId
The format to be copied.
*/
- void pasteFormat(sal_uInt32 _nFormatId);
+ void pasteFormat(SotClipboardFormatId _nFormatId);
/** pastes a query, form or report into the data source
@param _eType
@@ -287,7 +287,7 @@ namespace dbaui
@param _rFormatIds
The vector to be filled up.
*/
- void getSupportedFormats(ElementType _eType,::std::vector<SotFormatStringId>& _rFormatIds) const;
+ void getSupportedFormats(ElementType _eType,::std::vector<SotClipboardFormatId>& _rFormatIds) const;
/** adds a listener to the current name access.
@param _xCollection
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 4736dc2..39e4ecf 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -773,17 +773,17 @@ Reference<XNameContainer> OApplicationController::getQueryDefinitions() const
return xNames;
}
-void OApplicationController::getSupportedFormats(ElementType _eType,::std::vector<SotFormatStringId>& _rFormatIds) const
+void OApplicationController::getSupportedFormats(ElementType _eType,::std::vector<SotClipboardFormatId>& _rFormatIds) const
{
switch( _eType )
{
case E_TABLE:
- _rFormatIds.push_back(SOT_FORMATSTR_ID_DBACCESS_TABLE);
- _rFormatIds.push_back(SOT_FORMAT_RTF);
- _rFormatIds.push_back(SOT_FORMATSTR_ID_HTML);
+ _rFormatIds.push_back(SotClipboardFormatId::DBACCESS_TABLE);
+ _rFormatIds.push_back(SotClipboardFormatId::RTF);
+ _rFormatIds.push_back(SotClipboardFormatId::HTML);
// run through
case E_QUERY:
- _rFormatIds.push_back(SOT_FORMATSTR_ID_DBACCESS_QUERY);
+ _rFormatIds.push_back(SotClipboardFormatId::DBACCESS_QUERY);
break;
default:
break;
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 45185ed..3eda315 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -135,9 +135,9 @@ void OApplicationController::convertToView(const OUString& _sName)
}
}
-void OApplicationController::pasteFormat(sal_uInt32 _nFormatId)
+void OApplicationController::pasteFormat(SotClipboardFormatId _nFormatId)
{
- if ( _nFormatId )
+ if ( _nFormatId != SotClipboardFormatId::NONE )
{
try
{
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 6f05329..8a00197 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -1491,7 +1491,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
aReturn.bEnabled = m_aCurrentFrame.isActive() && !bIsReadOnly;
if(aReturn.bEnabled)
{
- aReturn.bEnabled = aReturn.bEnabled && IsFormatSupported( m_aSystemClipboard.GetDataFlavorExVector(), FORMAT_STRING );
+ aReturn.bEnabled = aReturn.bEnabled && IsFormatSupported( m_aSystemClipboard.GetDataFlavorExVector(), SotClipboardFormatId::STRING );
}
break;
}
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index 616f504..5df1f04 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -134,9 +134,9 @@ namespace dbaui
osl_atomic_decrement( &m_refCount );
}
- bool ODataClipboard::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ )
+ bool ODataClipboard::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ )
{
- if (nUserObjectId == SOT_FORMAT_RTF || nUserObjectId == SOT_FORMATSTR_ID_HTML )
+ if (nUserObjectId == SotClipboardFormatId::RTF || nUserObjectId == SotClipboardFormatId::HTML )
{
ODatabaseImportExport* pExport = reinterpret_cast<ODatabaseImportExport*>(pUserObject);
if ( pExport && rxOStm.Is() )
@@ -151,28 +151,30 @@ namespace dbaui
void ODataClipboard::AddSupportedFormats()
{
if ( m_pRtf.is() )
- AddFormat( SOT_FORMAT_RTF );
+ AddFormat( SotClipboardFormatId::RTF );
if ( m_pHtml.is() )
- AddFormat( SOT_FORMATSTR_ID_HTML );
+ AddFormat( SotClipboardFormatId::HTML );
ODataAccessObjectTransferable::AddSupportedFormats();
}
bool ODataClipboard::GetData( const DataFlavor& rFlavor, const OUString& rDestDoc )
{
- const sal_uLong nFormat = SotExchange::GetFormat(rFlavor);
+ const SotClipboardFormatId nFormat = SotExchange::GetFormat(rFlavor);
switch (nFormat)
{
- case SOT_FORMAT_RTF:
+ case SotClipboardFormatId::RTF:
if ( m_pRtf.is() )
m_pRtf->initialize(getDescriptor());
- return m_pRtf.is() && SetObject( m_pRtf.get(), SOT_FORMAT_RTF, rFlavor );
+ return m_pRtf.is() && SetObject( m_pRtf.get(), SotClipboardFormatId::RTF, rFlavor );
- case SOT_FORMATSTR_ID_HTML:
+ case SotClipboardFormatId::HTML:
if ( m_pHtml.is() )
m_pHtml->initialize(getDescriptor());
- return m_pHtml.is() && SetObject( m_pHtml.get(), SOT_FORMATSTR_ID_HTML, rFlavor );
+ return m_pHtml.is() && SetObject( m_pHtml.get(), SotClipboardFormatId::HTML, rFlavor );
+
+ default: break;
}
return ODataAccessObjectTransferable::GetData(rFlavor, rDestDoc);
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 632e7fd..71e7b14 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -1251,10 +1251,11 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
{
switch (_aType.mnSotId)
{
- case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor
- case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor
- case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command
+ case SotClipboardFormatId::DBACCESS_TABLE: // table descriptor
+ case SotClipboardFormatId::DBACCESS_QUERY: // query descriptor
+ case SotClipboardFormatId::DBACCESS_COMMAND: // SQL command
return true;
+ default: break;
}
return false;
}
@@ -1267,7 +1268,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
if (!::dbtools::getConnection(Reference< XRowSet > (getDataSource(),UNO_QUERY)).is())
return nAction;
- if ( IsDropFormatSupported( FORMAT_STRING ) ) do
+ if ( IsDropFormatSupported( SotClipboardFormatId::STRING ) ) do
{ // odd construction, but spares us a lot of (explicit ;) goto's
if (!GetEmptyRow().Is())
@@ -1366,7 +1367,7 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt )
if (!::dbtools::getConnection(Reference< XRowSet > (xDataSource,UNO_QUERY)).is())
return DND_ACTION_NONE;
- if ( IsDropFormatSupported( FORMAT_STRING ) )
+ if ( IsDropFormatSupported( SotClipboardFormatId::STRING ) )
{
long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), false);
sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), false);
@@ -1395,7 +1396,7 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt )
// get the dropped string
TransferableDataHelper aDropped( rEvt.maDropEvent.Transferable );
OUString sDropped;
- if ( !aDropped.GetString( FORMAT_STRING, sDropped ) )
+ if ( !aDropped.GetString( SotClipboardFormatId::STRING, sDropped ) )
return DND_ACTION_NONE;
rEdit.SetText( sDropped );
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 2566839..7643cfe 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1610,7 +1610,7 @@ bool OFieldDescControl::isPasteAllowed()
if ( bAllowed )
{
TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
- bAllowed = aTransferData.HasFormat(SOT_FORMAT_STRING);
+ bAllowed = aTransferData.HasFormat(SotClipboardFormatId::STRING);
}
return bAllowed;
}
diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx
index 18ab49a..34e0d83 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.hxx
@@ -57,7 +57,7 @@ namespace dbaui
void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, IDragTransferableListener* _pListener );
static OJoinExchangeData GetSourceDescription(const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxObject);
- static bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID=SOT_FORMATSTR_ID_SBA_JOIN);
+ static bool isFormatAvailable( const DataFlavorExVector& _rFormats ,SotClipboardFormatId _nSlotID=SotClipboardFormatId::SBA_JOIN);
protected:
virtual void AddSupportedFormats() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx
index 3ffefd8..d7795d1 100644
--- a/dbaccess/source/ui/inc/TableCopyHelper.hxx
+++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx
@@ -47,13 +47,14 @@ namespace dbaui
{
switch (_aType.mnSotId)
{
- case SOT_FORMAT_RTF: // RTF data descriptions
- case SOT_FORMATSTR_ID_HTML: // HTML data descriptions
- case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor
+ case SotClipboardFormatId::RTF: // RTF data descriptions
+ case SotClipboardFormatId::HTML: // HTML data descriptions
+ case SotClipboardFormatId::DBACCESS_TABLE: // table descriptor
return (E_TABLE == eEntryType);
- case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor
- case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command
+ case SotClipboardFormatId::DBACCESS_QUERY: // query descriptor
+ case SotClipboardFormatId::DBACCESS_COMMAND: // SQL command
return ((E_QUERY == eEntryType) || ( !bQueryDrop && E_TABLE == eEntryType));
+ default: break;
}
return false;
}
@@ -111,7 +112,7 @@ namespace dbaui
@param _sDestDataSourceName
The name of the dest data source.
*/
- void pasteTable( SotFormatStringId _nFormatId
+ void pasteTable( SotClipboardFormatId _nFormatId
,const TransferableDataHelper& _rTransData
,const OUString& _sDestDataSourceName
,const SharedConnection& _xConnection);
diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx
index 0f49ee4..84cc984 100644
--- a/dbaccess/source/ui/inc/TableRowExchange.hxx
+++ b/dbaccess/source/ui/inc/TableRowExchange.hxx
@@ -35,7 +35,7 @@ namespace dbaui
protected:
virtual void AddSupportedFormats() SAL_OVERRIDE;
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
- virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+ virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
virtual void ObjectReleased() SAL_OVERRIDE;
};
}
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx
index fa2d9be..47dfd7a 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -79,7 +79,7 @@ namespace dbaui
virtual void AddSupportedFormats() SAL_OVERRIDE;
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) SAL_OVERRIDE;
virtual void ObjectReleased() SAL_OVERRIDE;
- virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
+ virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE;
};
}
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 9906ff5..b9ad29c1 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -177,12 +177,12 @@ void OTableCopyHelper::pasteTable( const ::svx::ODataAccessDescriptor& _rPasteDa
i_rDestDataSourceName, i_rDestConnection );
}
-void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId
+void OTableCopyHelper::pasteTable( SotClipboardFormatId _nFormatId
,const TransferableDataHelper& _rTransData
,const OUString& i_rDestDataSource
,const SharedConnection& _xConnection)
{
- if ( _nFormatId == SOT_FORMATSTR_ID_DBACCESS_TABLE || _nFormatId == SOT_FORMATSTR_ID_DBACCESS_QUERY )
+ if ( _nFormatId == SotClipboardFormatId::DBACCESS_TABLE || _nFormatId == SotClipboardFormatId::DBACCESS_QUERY )
{
if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(_rTransData.GetDataFlavorExVector()) )
{
@@ -196,13 +196,13 @@ void OTableCopyHelper::pasteTable( SotFormatStringId _nFormatId
{
DropDescriptor aTrans;
bool bOk;
- if ( _nFormatId != SOT_FORMAT_RTF )
- bOk = const_cast<TransferableDataHelper&>(_rTransData).GetSotStorageStream(SOT_FORMATSTR_ID_HTML ,aTrans.aHtmlRtfStorage);
+ if ( _nFormatId != SotClipboardFormatId::RTF )
+ bOk = const_cast<TransferableDataHelper&>(_rTransData).GetSotStorageStream(SotClipboardFormatId::HTML ,aTrans.aHtmlRtfStorage);
else
- bOk = const_cast<TransferableDataHelper&>(_rTransData).GetSotStorageStream(SOT_FORMAT_RTF,aTrans.aHtmlRtfStorage);
+ bOk = const_cast<TransferableDataHelper&>(_rTransData).GetSotStorageStream(SotClipboardFormatId::RTF,aTrans.aHtmlRtfStorage);
aTrans.nType = E_TABLE;
- aTrans.bHtml = SOT_FORMATSTR_ID_HTML == _nFormatId;
+ aTrans.bHtml = SotClipboardFormatId::HTML == _nFormatId;
aTrans.sDefaultTableName = GetTableNameForAppend();
if ( !bOk || !copyTagTable(aTrans,false,_xConnection) )
m_pController->showError(SQLException(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE), *m_pController, OUString("S1000"), 0, Any()));
@@ -224,12 +224,12 @@ void OTableCopyHelper::pasteTable( const TransferableDataHelper& _rTransData
,const OUString& i_rDestDataSource
,const SharedConnection& _xConnection)
{
- if ( _rTransData.HasFormat(SOT_FORMATSTR_ID_DBACCESS_TABLE) || _rTransData.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY) )
- pasteTable( SOT_FORMATSTR_ID_DBACCESS_TABLE,_rTransData,i_rDestDataSource,_xConnection);
- else if ( _rTransData.HasFormat(SOT_FORMATSTR_ID_HTML) )
- pasteTable( SOT_FORMATSTR_ID_HTML,_rTransData,i_rDestDataSource,_xConnection);
- else if ( _rTransData.HasFormat(SOT_FORMAT_RTF) )
- pasteTable( SOT_FORMAT_RTF,_rTransData,i_rDestDataSource,_xConnection);
+ if ( _rTransData.HasFormat(SotClipboardFormatId::DBACCESS_TABLE) || _rTransData.HasFormat(SotClipboardFormatId::DBACCESS_QUERY) )
+ pasteTable( SotClipboardFormatId::DBACCESS_TABLE,_rTransData,i_rDestDataSource,_xConnection);
+ else if ( _rTransData.HasFormat(SotClipboardFormatId::HTML) )
+ pasteTable( SotClipboardFormatId::HTML,_rTransData,i_rDestDataSource,_xConnection);
+ else if ( _rTransData.HasFormat(SotClipboardFormatId::RTF) )
+ pasteTable( SotClipboardFormatId::RTF,_rTransData,i_rDestDataSource,_xConnection);
}
bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc, bool _bCheck, const SharedConnection& _xConnection)
@@ -255,10 +255,10 @@ bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc, bo
bool OTableCopyHelper::isTableFormat(const TransferableDataHelper& _rClipboard) const
{
- bool bTableFormat = _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_TABLE)
- || _rClipboard.HasFormat(SOT_FORMATSTR_ID_DBACCESS_QUERY)
- || _rClipboard.HasFormat(SOT_FORMAT_RTF)
- || _rClipboard.HasFormat(SOT_FORMATSTR_ID_HTML);
+ bool bTableFormat = _rClipboard.HasFormat(SotClipboardFormatId::DBACCESS_TABLE)
+ || _rClipboard.HasFormat(SotClipboardFormatId::DBACCESS_QUERY)
+ || _rClipboard.HasFormat(SotClipboardFormatId::RTF)
+ || _rClipboard.HasFormat(SotClipboardFormatId::HTML);
return bTableFormat;
}
@@ -268,14 +268,14 @@ bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedData
,const SharedConnection& _xConnection)
{
bool bRet = false;
- bool bHtml = _aDroppedData.HasFormat(SOT_FORMATSTR_ID_HTML);
- if ( bHtml || _aDroppedData.HasFormat(SOT_FORMAT_RTF) )
+ bool bHtml = _aDroppedData.HasFormat(SotClipboardFormatId::HTML);
+ if ( bHtml || _aDroppedData.HasFormat(SotClipboardFormatId::RTF) )
{
bool bOk;
if ( bHtml )
- bOk = const_cast<TransferableDataHelper&>(_aDroppedData).GetSotStorageStream(SOT_FORMATSTR_ID_HTML ,_rAsyncDrop.aHtmlRtfStorage);
+ bOk = const_cast<TransferableDataHelper&>(_aDroppedData).GetSotStorageStream(SotClipboardFormatId::HTML ,_rAsyncDrop.aHtmlRtfStorage);
else
- bOk = const_cast<TransferableDataHelper&>(_aDroppedData).GetSotStorageStream(SOT_FORMAT_RTF,_rAsyncDrop.aHtmlRtfStorage);
+ bOk = const_cast<TransferableDataHelper&>(_aDroppedData).GetSotStorageStream(SotClipboardFormatId::RTF,_rAsyncDrop.aHtmlRtfStorage);
_rAsyncDrop.bHtml = bHtml;
_rAsyncDrop.bError = !copyTagTable(_rAsyncDrop,true,_xConnection);
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index eb05f20..0cc4c77 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -56,7 +56,7 @@ namespace dbaui
m_pDragListener = NULL;
}
- bool OJoinExchObj::isFormatAvailable( const DataFlavorExVector& _rFormats ,SotFormatStringId _nSlotID)
+ bool OJoinExchObj::isFormatAvailable( const DataFlavorExVector& _rFormats ,SotClipboardFormatId _nSlotID)
{
DataFlavorExVector::const_iterator aCheckEnd = _rFormats.end();
for ( DataFlavorExVector::const_iterator aCheck = _rFormats.begin();
@@ -108,15 +108,15 @@ namespace dbaui
void OJoinExchObj::AddSupportedFormats()
{
- AddFormat( SOT_FORMATSTR_ID_SBA_JOIN );
+ AddFormat( SotClipboardFormatId::SBA_JOIN );
if ( m_bFirstEntry )
- AddFormat( SOT_FORMATSTR_ID_SBA_TABID );
+ AddFormat( SotClipboardFormatId::SBA_TABID );
}
bool OJoinExchObj::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
{
- sal_uInt32 nFormat = SotExchange::GetFormat(rFlavor);
- if ( SOT_FORMATSTR_ID_SBA_JOIN == nFormat )
+ SotClipboardFormatId nFormat = SotExchange::GetFormat(rFlavor);
+ if ( SotClipboardFormatId::SBA_JOIN == nFormat )
// this is a HACK
// we don't really copy our data, the instances using us have to call GetSourceDescription ....
// if, one day, we have a _lot_ of time, this hack should be removed ....
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index f11a7b8..1796dcf 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -214,8 +214,8 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt )
{
sal_Int8 nDND_Action = DND_ACTION_NONE;
// check the format
- if ( !OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SOT_FORMATSTR_ID_SBA_TABID) // this means that the first entry is to be draged
- && OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SOT_FORMATSTR_ID_SBA_JOIN) )
+ if ( !OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SotClipboardFormatId::SBA_TABID) // this means that the first entry is to be draged
+ && OJoinExchObj::isFormatAvailable(GetDataFlavorExVector(),SotClipboardFormatId::SBA_JOIN) )
{ // don't drop into the window if it's the drag source itself
// remove the selection if the dragging operation is leaving the window
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index ad3e528..d8b907d 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -769,10 +769,10 @@ void OTableEditorCtrl::InsertRows( long nRow )
::std::vector< ::boost::shared_ptr<OTableRow> > vInsertedUndoRedoRows; // need for undo/redo handling
// get rows from clipboard
TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
- if(aTransferData.HasFormat(SOT_FORMATSTR_ID_SBA_TABED))
+ if(aTransferData.HasFormat(SotClipboardFormatId::SBA_TABED))
{
SotStorageStreamRef aStreamRef;
- bool bOk = aTransferData.GetSotStorageStream(SOT_FORMATSTR_ID_SBA_TABED,aStreamRef);
+ bool bOk = aTransferData.GetSotStorageStream(SotClipboardFormatId::SBA_TABED,aStreamRef);
if (bOk && aStreamRef.Is())
{
aStreamRef->Seek(STREAM_SEEK_TO_BEGIN);
@@ -1173,11 +1173,11 @@ bool OTableEditorCtrl::IsPasteAllowed( long /*nRow*/ )
if ( bAllowed )
{
TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
- bool bRowFormat = aTransferData.HasFormat(SOT_FORMATSTR_ID_SBA_TABED);
+ bool bRowFormat = aTransferData.HasFormat(SotClipboardFormatId::SBA_TABED);
if ( m_eChildFocus == ROW )
bAllowed = bRowFormat;
else
- bAllowed = !bRowFormat && aTransferData.HasFormat(SOT_FORMAT_STRING);
+ bAllowed = !bRowFormat && aTransferData.HasFormat(SotClipboardFormatId::STRING);
}
return bAllowed;
@@ -1235,7 +1235,7 @@ void OTableEditorCtrl::copy()
void OTableEditorCtrl::paste()
{
TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
- if(aTransferData.HasFormat(SOT_FORMATSTR_ID_SBA_TABED))
+ if(aTransferData.HasFormat(SotClipboardFormatId::SBA_TABED))
{
if( nPasteEvent )
Application::RemoveUserEvent( nPasteEvent );
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index 37e68dd..b6d036b 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -30,9 +30,9 @@ namespace dbaui
: m_vTableRow(_rvTableRow)
{
}
- bool OTableRowExchange::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ )
+ bool OTableRowExchange::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ )
{
- if(nUserObjectId == SOT_FORMATSTR_ID_SBA_TABED)
+ if(nUserObjectId == SotClipboardFormatId::SBA_TABED)
{
::std::vector< ::boost::shared_ptr<OTableRow> >* pRows = reinterpret_cast< ::std::vector< ::boost::shared_ptr<OTableRow> >* >(pUserObject);
if(pRows)
@@ -50,13 +50,13 @@ namespace dbaui
void OTableRowExchange::AddSupportedFormats()
{
if ( !m_vTableRow.empty() )
- AddFormat(SOT_FORMATSTR_ID_SBA_TABED);
+ AddFormat(SotClipboardFormatId::SBA_TABED);
}
bool OTableRowExchange::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
{
- sal_uLong nFormat = SotExchange::GetFormat(rFlavor);
- if(nFormat == SOT_FORMATSTR_ID_SBA_TABED)
- return SetObject(&m_vTableRow,SOT_FORMATSTR_ID_SBA_TABED,rFlavor);
+ SotClipboardFormatId nFormat = SotExchange::GetFormat(rFlavor);
+ if(nFormat == SotClipboardFormatId::SBA_TABED)
+ return SetObject(&m_vTableRow,SotClipboardFormatId::SBA_TABED,rFlavor);
return false;
}
void OTableRowExchange::ObjectReleased()
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 156f4fa..888ab99 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -215,9 +215,9 @@ Sequence< OUString > SAL_CALL CDataFormatTranslator::getSupportedServiceNames( )
void SAL_CALL CDataFormatTranslator::initTranslationTable()
{
- //SOT_FORMATSTR_ID_DIF
+ //SotClipboardFormatId::DIF
m_TranslTable.push_back(FormatEntry("application/x-openoffice-dif;windows_formatname=\"DIF\"", "DIF", "DIF", CF_DIF, CPPUTYPE_DEFAULT));
- // SOT_FORMAT_BITMAP
+ // SotClipboardFormatId::BITMAP
// #i124085# CF_DIBV5 disabled, leads to problems at export. To fully support, using
// an own mime-type may be necessary. I have tried that, but saw no real advantages
@@ -227,7 +227,7 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_DIB, CPPUTYPE_DEFAULT));
m_TranslTable.push_back(FormatEntry("application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"", "Bitmap", "Bitmap", CF_BITMAP, CPPUTYPE_DEFAULT));
- // SOT_FORMAT_STRING
+ // SotClipboardFormatId::STRING
m_TranslTable.push_back(FormatEntry("text/plain;charset=utf-16", "Unicode-Text", "", CF_UNICODETEXT, CppuType_String));
// Format Locale - for internal use
m_TranslTable.push_back(FormatEntry("application/x-openoffice-locale;windows_formatname=\"Locale\"", "Locale", "Locale", CF_LOCALE, CPPUTYPE_DEFAULT));
@@ -235,232 +235,232 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
m_TranslTable.push_back(FormatEntry("application/x-openoffice-wmf;windows_formatname=\"Image WMF\"", "Windows MetaFile", "Image WMF", CF_METAFILEPICT, CPPUTYPE_DEFAULT));
// SOT_FORMAT_EMF
m_TranslTable.push_back(FormatEntry("application/x-openoffice-emf;windows_formatname=\"Image EMF\"", "Windows Enhanced MetaFile", "Image EMF", CF_ENHMETAFILE, CPPUTYPE_DEFAULT));
- // SOT_FORMAT_FILE_LIST
+ // SotClipboardFormatId::FILE_LIST
m_TranslTable.push_back(FormatEntry("application/x-openoffice-filelist;windows_formatname=\"FileList\"", "FileList", "FileList", CF_HDROP, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SYLK
+ //SotClipboardFormatId::SYLK
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sylk;windows_formatname=\"Sylk\"", "Sylk", "Sylk", CF_SYLK, CPPUTYPE_DEFAULT ) );
- // SOT_FORMAT_GDIMETAFILE
+ // SotClipboardFormatId::GDIMETAFILE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"", "GDIMetaFile", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMAT_PRIVATE
+ // SotClipboardFormatId::PRIVATE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-private;windows_formatname=\"Private\"", "Private", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMAT_FILE
+ // SotClipboardFormatId::FILE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-file;windows_formatname=\"FileName\"", "FileName", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMAT_RTF
+ // SotClipboardFormatId::RTF
m_TranslTable.push_back(FormatEntry("text/richtext", "Rich Text Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_DRAWING
+ // SotClipboardFormatId::DRAWING
m_TranslTable.push_back(FormatEntry("application/x-openoffice-drawing;windows_formatname=\"Drawing Format\"", "Drawing Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_SVXB
+ // SotClipboardFormatId::SVXB
m_TranslTable.push_back(FormatEntry("application/x-openoffice-svbx;windows_formatname=\"SVXB (StarView Bitmap/Animation)\"", "SVXB (StarView Bitmap/Animation)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_SVIM
+ // SotClipboardFormatId::SVIM
m_TranslTable.push_back(FormatEntry("application/x-openoffice-svim;windows_formatname=\"SVIM (StarView ImageMap)\"", "SVIM (StarView ImageMap)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_XFA
+ // SotClipboardFormatId::XFA
m_TranslTable.push_back(FormatEntry("application/x-openoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr)\"", "XFA (XOutDev FillAttr)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_EDITENGINE
+ // SotClipboardFormatId::EDITENGINE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"", "EditEngineFormat", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_INTERNALLINK_STATE
+ // SotClipboardFormatId::INTERNALLINK_STATE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_SOLK
+ // SotClipboardFormatId::SOLK
m_TranslTable.push_back(FormatEntry("application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"", "SOLK (StarOffice Link)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK
+ // SotClipboardFormatId::NETSCAPE_BOOKMARK
m_TranslTable.push_back(FormatEntry("application/x-openoffice-netscape-bookmark;windows_formatname=\"Netscape Bookmark\"", "Netscape Bookmark", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_TREELISTBOX
+ // SotClipboardFormatId::TREELISTBOX
m_TranslTable.push_back(FormatEntry("application/x-openoffice-treelistbox;windows_formatname=\"SV_LBOX_DD_FORMAT\"", "SV_LBOX_DD_FORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_NATIVE
+ // SotClipboardFormatId::NATIVE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-native;windows_formatname=\"Native\"", "Native", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_OWNERLINK
+ // SotClipboardFormatId::OWNERLINK
m_TranslTable.push_back(FormatEntry("application/x-openoffice-ownerlink;windows_formatname=\"OwnerLink\"", "OwnerLink", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_STARSERVER
+ // SotClipboardFormatId::STARSERVER
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starserver;windows_formatname=\"StarServerFormat\"", "StarServerFormat", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_STAROBJECT
+ // SotClipboardFormatId::STAROBJECT
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starobject;windows_formatname=\"StarObjectFormat\"", "StarObjectFormat", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_APPLETOBJECT
+ // SotClipboardFormatId::APPLETOBJECT
m_TranslTable.push_back(FormatEntry("application/x-openoffice-appletobject;windows_formatname=\"Applet Object\"", "Applet Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_PLUGIN_OBJECT
+ // SotClipboardFormatId::PLUGIN_OBJECT
m_TranslTable.push_back(FormatEntry("application/x-openoffice-plugin-object;windows_formatname=\"PlugIn Object\"", "PlugIn Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_STARWRITER_30
+ // SotClipboardFormatId::STARWRITER_30
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriter-30;windows_formatname=\"StarWriter 3.0\"", "StarWriter 3.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARWRITER_40
+ //SotClipboardFormatId::STARWRITER_40
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriter-40;windows_formatname=\"StarWriter 4.0\"", "StarWriter 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARWRITER_50
+ //SotClipboardFormatId::STARWRITER_50
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriter-50;windows_formatname=\"StarWriter 5.0\"", "StarWriter 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARWRITERWEB_40
+ //SotClipboardFormatId::STARWRITERWEB_40
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriterweb-40;windows_formatname=\"StarWriter/Web 4.0\"", "StarWriter/Web 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARWRITERWEB_50
+ //SotClipboardFormatId::STARWRITERWEB_50
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriterweb-50;windows_formatname=\"StarWriter/Web 5.0\"", "StarWriter/Web 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARWRITERGLOB_40
+ //SotClipboardFormatId::STARWRITERGLOB_40
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriterglob-40;windows_formatname=\"StarWriter/Global 4.0\"", "StarWriter/Global 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_STARWRITERGLOB_50
+ // SotClipboardFormatId::STARWRITERGLOB_50
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starwriterglob-50;windows_formatname=\"StarWriter/Global 5.0\"", "StarWriter/Global 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARDRAW
+ //SotClipboardFormatId::STARDRAW
m_TranslTable.push_back(FormatEntry("application/x-openoffice-stardraw;windows_formatname=\"StarDrawDocument\"", "StarDrawDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARDRAW_40
+ //SotClipboardFormatId::STARDRAW_40
m_TranslTable.push_back(FormatEntry("application/x-openoffice-stardraw-40;windows_formatname=\"StarDrawDocument 4.0\"", "StarDrawDocument 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARIMPRESS_50
+ //SotClipboardFormatId::STARIMPRESS_50
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starimpress-50;windows_formatname=\"StarImpress 5.0\"", "StarImpress 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_STARDRAW_50
+ // SotClipboardFormatId::STARDRAW_50
m_TranslTable.push_back(FormatEntry("application/x-openoffice-stardraw-50;windows_formatname=\"StarDraw 5.0\"", "StarDraw 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARCALC
+ //SotClipboardFormatId::STARCALC
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starcalc;windows_formatname=\"StarCalcDocument\"", "StarCalcDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARCALC_40
+ //SotClipboardFormatId::STARCALC_40
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starcalc-40;windows_formatname=\"StarCalc 4.0\"", "StarCalc 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_STARCALC_50
+ // SotClipboardFormatId::STARCALC_50
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starcalc-50;windows_formatname=\"StarCalc 5.0\"", "StarCalc 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_STARCHART
+ // SotClipboardFormatId::STARCHART
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchart;windows_formatname=\"StarChartDocument\"", "StarChartDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_STARCHART_40
+ // SotClipboardFormatId::STARCHART_40
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchart-40;windows_formatname=\"StarChartDocument 4.0\"", "StarChartDocument 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- // SOT_FORMATSTR_ID_STARCHART_50
+ // SotClipboardFormatId::STARCHART_50
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchart-50;windows_formatname=\"StarChart 5.0\"", "StarChart 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARIMAGE
+ //SotClipboardFormatId::STARIMAGE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starimage;windows_formatname=\"StarImageDocument\"", "StarImageDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARIMAGE_40
+ //SotClipboardFormatId::STARIMAGE_40
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starimage-40;windows_formatname=\"StarImageDocument 4.0\"", "StarImageDocument 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARIMAGE_50
+ //SotClipboardFormatId::STARIMAGE_50
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starimage-50;windows_formatname=\"StarImage 5.0\"", "StarImage 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARMATH
+ //SotClipboardFormatId::STARMATH
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starmath;windows_formatname=\"StarMath\"", "StarMath", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARMATH_40
+ //SotClipboardFormatId::STARMATH_40
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starmath-40;windows_formatname=\"StarMathDocument 4.0\"", "StarMathDocument 4.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARMATH_50
+ //SotClipboardFormatId::STARMATH_50
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starmath-50;windows_formatname=\"StarMath 5.0\"", "StarMath 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STAROBJECT_PAINTDOC
+ //SotClipboardFormatId::STAROBJECT_PAINTDOC
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starobject-paintdoc;windows_formatname=\"StarObjectPaintDocument\"", "StarObjectPaintDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_FILLED_AREA
+ //SotClipboardFormatId::FILLED_AREA
m_TranslTable.push_back(FormatEntry("application/x-openoffice-filled-area;windows_formatname=\"FilledArea\"", "FilledArea", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_HTML
+ //SotClipboardFormatId::HTML
m_TranslTable.push_back(FormatEntry("text/html", "HTML (HyperText Markup Language)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_HTML_SIMPLE
+ //SotClipboardFormatId::HTML_SIMPLE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-html-simple;windows_formatname=\"HTML Format\"", "HTML Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_CHAOS
+ //SotClipboardFormatId::CHAOS
m_TranslTable.push_back(FormatEntry("application/x-openoffice-chaos;windows_formatname=\"FORMAT_CHAOS\"", "FORMAT_CHAOS", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_CNT_MSGATTACHFILE
+ //SotClipboardFormatId::CNT_MSGATTACHFILE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-msgattachfile;windows_formatname=\"CNT_MSGATTACHFILE_FORMAT\"", "CNT_MSGATTACHFILE_FORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_BIFF_5
+ //SotClipboardFormatId::BIFF_5
m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff5;windows_formatname=\"Biff5\"", "Biff5", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_BIFF__5
+ //SotClipboardFormatId::BIFF__5
m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff-5;windows_formatname=\"Biff 5\"", "Biff 5", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_BIFF_8
+ //SotClipboardFormatId::BIFF_8
m_TranslTable.push_back(FormatEntry("application/x-openoffice-biff-8;windows_formatname=\"Biff8\"", "Biff8", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SYLK_BIGCAPS
+ //SotClipboardFormatId::SYLK_BIGCAPS
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sylk-bigcaps;windows_formatname=\"SYLK\"", "SYLK", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_LINK
+ //SotClipboardFormatId::LINK
m_TranslTable.push_back(FormatEntry("application/x-openoffice-link;windows_formatname=\"Link\"", "Link", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARDRAW_TABBAR
+ //SotClipboardFormatId::STARDRAW_TABBAR
m_TranslTable.push_back(FormatEntry("application/x-openoffice-stardraw-tabbar;windows_formatname=\"StarDraw TabBar\"", "StarDraw TabBar", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SONLK
+ //SotClipboardFormatId::SONLK
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sonlk;windows_formatname=\"SONLK (StarOffice Navi Link)\"", "SONLK (StarOffice Navi Link)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_MSWORD_DOC
+ //SotClipboardFormatId::MSWORD_DOC
m_TranslTable.push_back(FormatEntry("application/msword", "MSWordDoc", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STAR_FRAMESET_DOC
+ //SotClipboardFormatId::STAR_FRAMESET_DOC
m_TranslTable.push_back(FormatEntry("application/x-openoffice-star-frameset-doc;windows_formatname=\"StarFrameSetDocument\"", "StarFrameSetDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_OFFICE_DOC
+ //SotClipboardFormatId::OFFICE_DOC
m_TranslTable.push_back(FormatEntry("application/x-openoffice-office-doc;windows_formatname=\"OfficeDocument\"", "OfficeDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_NOTES_DOCINFO
+ //SotClipboardFormatId::NOTES_DOCINFO
m_TranslTable.push_back(FormatEntry("application/x-openoffice-notes-docinfo;windows_formatname=\"NotesDocInfo\"", "NotesDocInfo", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_NOTES_HNOTE
+ //SotClipboardFormatId::NOTES_HNOTE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-notes-hnote;windows_formatname=\"NoteshNote\"", "NoteshNote", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_NOTES_NATIVE
+ //SotClipboardFormatId::NOTES_NATIVE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-notes-native;windows_formatname=\"Native\"", "Native", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SFX_DOC
+ //SotClipboardFormatId::SFX_DOC
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sfx-doc;windows_formatname=\"SfxDocument\"", "SfxDocument", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_EVDF
+ //SotClipboardFormatId::EVDF
m_TranslTable.push_back(FormatEntry("application/x-openoffice-evdf;windows_formatname=\"EVDF (Explorer View Dummy Format)\"", "EVDF (Explorer View Dummy Format)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_ESDF
+ //SotClipboardFormatId::ESDF
m_TranslTable.push_back(FormatEntry("application/x-openoffice-esdf;windows_formatname=\"ESDF (Explorer Search Dummy Format)\"", "ESDF (Explorer Search Dummy Format)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_IDF
+ //SotClipboardFormatId::IDF
m_TranslTable.push_back(FormatEntry("application/x-openoffice-idf;windows_formatname=\"IDF (Iconview Dummy Format)\"", "IDF (Iconview Dummy Format)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_EFTP
+ //SotClipboardFormatId::EFTP
m_TranslTable.push_back(FormatEntry("application/x-openoffice-eftp;windows_formatname=\"EFTP (Explorer Ftp File)\"", "EFTP (Explorer Ftp File)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_EFD
+ //SotClipboardFormatId::EFD
m_TranslTable.push_back(FormatEntry("application/x-openoffice-efd;windows_formatname=\"EFD (Explorer Ftp Dir)\"", "EFD (Explorer Ftp Dir)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SVX_FORMFIELDEXCH
+ //SotClipboardFormatId::SVX_FORMFIELDEXCH
m_TranslTable.push_back(FormatEntry("application/x-openoffice-svx-formfieldexch;windows_formatname=\"SvxFormFieldExch\"", "SvxFormFieldExch", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_EXTENDED_TABBAR
+ //SotClipboardFormatId::EXTENDED_TABBAR
m_TranslTable.push_back(FormatEntry("application/x-openoffice-extended-tabbar;windows_formatname=\"ExtendedTabBar\"", "ExtendedTabBar", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SBA_DATAEXCHANGE
+ //SotClipboardFormatId::SBA_DATAEXCHANGE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-dataexchange;windows_formatname=\"SBA-DATAFORMAT\"", "SBA-DATAFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE
+ //SotClipboardFormatId::SBA_FIELDDATAEXCHANGE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-fielddataexchange;windows_formatname=\"SBA-FIELDFORMAT\"", "SBA-FIELDFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SBA_PRIVATE_URL
+ //SotClipboardFormatId::SBA_PRIVATE_URL
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-private-url;windows_formatname=\"SBA-PRIVATEURLFORMAT\"", "SBA-PRIVATEURLFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SBA_TABED
+ //SotClipboardFormatId::SBA_TABED
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-tabed;windows_formatname=\"Tabed\"", "Tabed", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SBA_TABID
+ //SotClipboardFormatId::SBA_TABID
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-tabid;windows_formatname=\"Tabid\"", "Tabid", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SBA_JOIN
+ //SotClipboardFormatId::SBA_JOIN
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-join;windows_formatname=\"SBA-JOINFORMAT\"", "SBA-JOINFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_OBJECTDESCRIPTOR
+ //SotClipboardFormatId::OBJECTDESCRIPTOR
m_TranslTable.push_back(FormatEntry("application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"", "Star Object Descriptor (XML)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR
+ //SotClipboardFormatId::LINKSRCDESCRIPTOR
m_TranslTable.push_back(FormatEntry("application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link Source Descriptor (XML)\"", "Star Link Source Descriptor (XML)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_EMBED_SOURCE
+ //SotClipboardFormatId::EMBED_SOURCE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"", "Star Embed Source (XML)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_LINK_SOURCE
+ //SotClipboardFormatId::LINK_SOURCE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-link-source-xml;windows_formatname=\"Star Link Source (XML)\"", "Star Link Source (XML)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_EMBEDDED_OBJ
+ //SotClipboardFormatId::EMBEDDED_OBJ
m_TranslTable.push_back(FormatEntry("application/x-openoffice-embedded-obj-xml;windows_formatname=\"Star Embedded Object (XML)\"", "Star Embedded Object (XML)", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_FILECONTENT
+ //SotClipboardFormatId::FILECONTENT
m_TranslTable.push_back(FormatEntry("application/x-openoffice-filecontent;windows_formatname=\"" CFSTR_FILECONTENTS "\"", CFSTR_FILECONTENTS, NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR
+ //SotClipboardFormatId::FILEGRPDESCRIPTOR
m_TranslTable.push_back(FormatEntry("application/x-openoffice-filegrpdescriptor;windows_formatname=\"" CFSTR_FILEDESCRIPTOR "\"", CFSTR_FILEDESCRIPTOR, NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_FILENAME
+ //SotClipboardFormatId::FILENAME
m_TranslTable.push_back(FormatEntry("application/x-openoffice-filename;windows_formatname=\"" CFSTR_FILENAME "\"", CFSTR_FILENAME, NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SD_OLE
+ //SotClipboardFormatId::SD_OLE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sd-ole;windows_formatname=\"SD-OLE\"", "SD-OLE", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE
+ //SotClipboardFormatId::EMBEDDED_OBJ_OLE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-embedded-obj-ole;windows_formatname=\"Embedded Object\"", "Embedded Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_EMBED_SOURCE_OLE
+ //SotClipboardFormatId::EMBED_SOURCE_OLE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-embed-source-ole;windows_formatname=\"Embed Source\"", "Embed Source", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE
+ //SotClipboardFormatId::OBJECTDESCRIPTOR_OLE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-objectdescriptor-ole;windows_formatname=\"Object Descriptor\"", "Object Descriptor", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR_OLE
+ //SotClipboardFormatId::LINKSRCDESCRIPTOR_OLE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-linkdescriptor-ole;windows_formatname=\"Link Source Descriptor\"", "Link Source Descriptor", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_LINK_SOURCE_OLE
+ //SotClipboardFormatId::LINK_SOURCE_OLE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-link-source-ole;windows_formatname=\"Link Source\"", "Link Source", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE
+ //SotClipboardFormatId::SBA_CTRLDATAEXCHANGE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-ctrldataexchange;windows_formatname=\"SBA-CTRLFORMAT\"", "SBA-CTRLFORMAT", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_OUTPLACE_OBJ
+ //SotClipboardFormatId::OUTPLACE_OBJ
m_TranslTable.push_back(FormatEntry("application/x-openoffice-outplace-obj;windows_formatname=\"OutPlace Object\"", "OutPlace Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_CNT_OWN_CLIP
+ //SotClipboardFormatId::CNT_OWN_CLIP
m_TranslTable.push_back(FormatEntry("application/x-openoffice-cnt-own-clip;windows_formatname=\"CntOwnClipboard\"", "CntOwnClipboard", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_INET_IMAGE
+ //SotClipboardFormatId::INET_IMAGE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-inet-image;windows_formatname=\"SO-INet-Image\"", "SO-INet-Image", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_NETSCAPE_IMAGE
+ //SotClipboardFormatId::NETSCAPE_IMAGE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-netscape-image;windows_formatname=\"Netscape Image Format\"", "Netscape Image Format", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_SBA_FORMEXCHANGE
- m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-formexchange;windows_formatname=\"SBA_FORMEXCHANGE\"", "SBA_FORMEXCHANGE", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_SBA_REPORTEXCHANGE
+ //SotClipboardFormatId::SBA_FORMEXCHANGE
+ m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-formexchange;windows_formatname=\"SBA_FORMEXCHANGE\"", "SBA_FORMEXCHANGE", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SotClipboardFormatId::SBA_REPORTEXCHANGE
m_TranslTable.push_back(FormatEntry("application/x-openoffice-sba-reportexchange;windows_formatname=\"SBA_REPORTEXCHANGE\"", "SBA_REPORTEXCHANGE", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR
+ //SotClipboardFormatId::UNIFORMRESOURCELOCATOR
m_TranslTable.push_back(FormatEntry("application/x-openoffice-uniformresourcelocator;windows_formatname=\"UniformResourceLocator\"", "UniformResourceLocator", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARCHARTDOCUMENT_50
+ //SotClipboardFormatId::STARCHARTDOCUMENT_50
m_TranslTable.push_back(FormatEntry("application/x-openoffice-starchartdocument-50;windows_formatname=\"StarChartDocument 5.0\"", "StarChartDocument 5.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_GRAPHOBJ
+ //SotClipboardFormatId::GRAPHOBJ
m_TranslTable.push_back(FormatEntry("application/x-openoffice-graphobj;windows_formatname=\"Graphic Object\"", "Graphic Object", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARWRITER_60
+ //SotClipboardFormatId::STARWRITER_60
m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.writer", "Writer 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARWRITERWEB_60
+ //SotClipboardFormatId::STARWRITERWEB_60
m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.writer.web", "Writer/Web 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARWRITERGLOB_60
+ //SotClipboardFormatId::STARWRITERGLOB_60
m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.writer.global", "Writer/Global 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARWDRAW_60
+ //SotClipboardFormatId::STARWDRAW_60
m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.draw", "Draw 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARIMPRESS_60
+ //SotClipboardFormatId::STARIMPRESS_60
m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.impress", "Impress 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARCALC_60
+ //SotClipboardFormatId::STARCALC_60
m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.calc", "Calc 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARCHART_60
+ //SotClipboardFormatId::STARCHART_60
m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.chart", "Chart 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_STARMATH_60
+ //SotClipboardFormatId::STARMATH_60
m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.math", "Math 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_DIALOG_60
+ //SotClipboardFormatId::DIALOG_60
m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.dialog", "Dialog 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_BMP
+ //SotClipboardFormatId::BMP
m_TranslTable.push_back(FormatEntry("image/bmp", "Windows Bitmap", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_PNG
+ //SotClipboardFormatId::PNG
m_TranslTable.push_back(FormatEntry("image/png", "PNG", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_DUMMY3
+ //SotClipboardFormatId::DUMMY3
m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy3;windows_formatname=\"SO_DUMMYFORMAT_3\"", "SO_DUMMYFORMAT_3", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
- //SOT_FORMATSTR_ID_DUMMY4
+ //SotClipboardFormatId::DUMMY4
m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy4;windows_formatname=\"SO_DUMMYFORMAT_4\"", "SO_DUMMYFORMAT_4", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
}
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 1889439..2093382 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2702,7 +2702,7 @@ bool EditEngine::HasValidData( const ::com::sun::star::uno::Reference< ::com::su
{
// Every application that copies rtf or any other text format also copies plain text into the clipboard....
datatransfer::DataFlavor aFlavor;
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aFlavor );
bValidData = rTransferable->isDataFlavorSupported( aFlavor );
}
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index 2bf54c5..40839aa 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -52,18 +52,18 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo
{
uno::Any aAny;
- sal_uLong nT = SotExchange::GetFormat( rFlavor );
- if ( nT == SOT_FORMAT_STRING )
+ SotClipboardFormatId nT = SotExchange::GetFormat( rFlavor );
+ if ( nT == SotClipboardFormatId::STRING )
{
aAny <<= GetString();
}
- else if ( ( nT == SOT_FORMATSTR_ID_EDITENGINE ) || ( nT == SOT_FORMAT_RTF ) )
+ else if ( ( nT == SotClipboardFormatId::EDITENGINE ) || ( nT == SotClipboardFormatId::RTF ) )
{
// No RTF on demand any more:
// 1) Was not working, because I had to flush() the clipboard immediately anyway
// 2) Don't have the old pool defaults and the StyleSheetPool here.
- SvMemoryStream* pStream = ( nT == SOT_FORMATSTR_ID_EDITENGINE ) ? &GetStream() : &GetRTFStream();
+ SvMemoryStream* pStream = ( nT == SotClipboardFormatId::EDITENGINE ) ? &GetStream() : &GetRTFStream();
pStream->Seek( STREAM_SEEK_TO_END );
sal_Size nLen = pStream->Tell();
pStream->Seek(0);
@@ -84,9 +84,9 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo
uno::Sequence< datatransfer::DataFlavor > EditDataObject::getTransferDataFlavors( ) throw(uno::RuntimeException, std::exception)
{
uno::Sequence< datatransfer::DataFlavor > aDataFlavors(3);
- SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_EDITENGINE, aDataFlavors.getArray()[0] );
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aDataFlavors.getArray()[1] );
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_RTF, aDataFlavors.getArray()[2] );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::EDITENGINE, aDataFlavors.getArray()[0] );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aDataFlavors.getArray()[1] );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::RTF, aDataFlavors.getArray()[2] );
return aDataFlavors;
}
@@ -95,8 +95,8 @@ sal_Bool EditDataObject::isDataFlavorSupported( const datatransfer::DataFlavor&
{
bool bSupported = false;
- sal_uLong nT = SotExchange::GetFormat( rFlavor );
- if ( ( nT == SOT_FORMAT_STRING ) || ( nT == SOT_FORMAT_RTF ) || ( nT == SOT_FORMATSTR_ID_EDITENGINE ) )
+ SotClipboardFormatId nT = SotExchange::GetFormat( rFlavor );
+ if ( ( nT == SotClipboardFormatId::STRING ) || ( nT == SotClipboardFormatId::RTF ) || ( nT == SotClipboardFormatId::EDITENGINE ) )
bSupported = true;
return bSupported;
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index ed456a1..f0af594 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1377,7 +1377,7 @@ void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::dat
if ( DoSingleLinePaste() )
{
datatransfer::DataFlavor aFlavor;
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aFlavor );
if ( xDataObj->isDataFlavorSupported( aFlavor ) )
{
try
@@ -1860,7 +1860,7 @@ void ImpEditView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTarg
// Check for supported format...
// Only check for text, will also be there if bin or rtf
datatransfer::DataFlavor aTextFlavor;
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aTextFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aTextFlavor );
const ::com::sun::star::datatransfer::DataFlavor* pFlavors = rDTDEE.SupportedDataFlavors.getConstArray();
int nFlavors = rDTDEE.SupportedDataFlavors.getLength();
for ( int n = 0; n < nFlavors; n++ )
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 74f89cc..fb3003e 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3471,7 +3471,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
if ( bUseSpecial )
{
// BIN
- SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_EDITENGINE, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::EDITENGINE, aFlavor );
if ( rxDataObj->isDataFlavorSupported( aFlavor ) )
{
try
@@ -3493,7 +3493,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
if ( !bDone )
{
// RTF
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_RTF, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::RTF, aFlavor );
if ( rxDataObj->isDataFlavorSupported( aFlavor ) )
{
try
@@ -3520,7 +3520,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
}
if ( !bDone )
{
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aFlavor );
if ( rxDataObj->isDataFlavorSupported( aFlavor ) )
{
try
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 4302999..81617fa 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -743,7 +743,7 @@ void BibFrameController_Impl::addStatusListener(
if ( xDataObj.is() )
{
datatransfer::DataFlavor aFlavor;
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aFlavor );
try
{
uno::Any aData = xDataObj->getTransferData( aFlavor );
diff --git a/filter/qa/cppunit/filters-dxf-test.cxx b/filter/qa/cppunit/filters-dxf-test.cxx
index 1d78a61..8d5be38 100644
--- a/filter/qa/cppunit/filters-dxf-test.cxx
+++ b/filter/qa/cppunit/filters-dxf-test.cxx
@@ -36,7 +36,7 @@ public:
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+ unsigned int, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
/**
* Ensure CVEs remain unbroken
@@ -50,7 +50,7 @@ public:
bool DxfFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int)
+ unsigned int, SotClipboardFormatId, unsigned int)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
diff --git a/filter/qa/cppunit/filters-eps-test.cxx b/filter/qa/cppunit/filters-eps-test.cxx
index 2167281..2cab8cd 100644
--- a/filter/qa/cppunit/filters-eps-test.cxx
+++ b/filter/qa/cppunit/filters-eps-test.cxx
@@ -36,7 +36,7 @@ public:
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+ unsigned int, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
/**
* Ensure CVEs remain unbroken
@@ -50,7 +50,7 @@ public:
bool EpsFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int)
+ unsigned int, SotClipboardFormatId, unsigned int)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
diff --git a/filter/qa/cppunit/filters-met-test.cxx b/filter/qa/cppunit/filters-met-test.cxx
index 4e551d2..69ced46 100644
--- a/filter/qa/cppunit/filters-met-test.cxx
+++ b/filter/qa/cppunit/filters-met-test.cxx
@@ -36,7 +36,7 @@ public:
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+ unsigned int, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
/**
* Ensure CVEs remain unbroken
@@ -50,7 +50,7 @@ public:
bool MetFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int)
+ unsigned int, SotClipboardFormatId, unsigned int)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
diff --git a/filter/qa/cppunit/filters-pcd-test.cxx b/filter/qa/cppunit/filters-pcd-test.cxx
index 1658f4c..16fbefb 100644
--- a/filter/qa/cppunit/filters-pcd-test.cxx
+++ b/filter/qa/cppunit/filters-pcd-test.cxx
@@ -36,7 +36,7 @@ public:
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+ unsigned int, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
/**
* Ensure CVEs remain unbroken
@@ -50,7 +50,7 @@ public:
bool PcdFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int)
+ unsigned int, SotClipboardFormatId, unsigned int)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
diff --git a/filter/qa/cppunit/filters-pcx-test.cxx b/filter/qa/cppunit/filters-pcx-test.cxx
index 92139b1..b478af5 100644
--- a/filter/qa/cppunit/filters-pcx-test.cxx
+++ b/filter/qa/cppunit/filters-pcx-test.cxx
@@ -36,7 +36,7 @@ public:
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+ unsigned int, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
/**
* Ensure CVEs remain unbroken
@@ -50,7 +50,7 @@ public:
bool PcxFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int)
+ unsigned int, SotClipboardFormatId, unsigned int)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx
index 35fed61..0ea1301 100644
--- a/filter/qa/cppunit/filters-pict-test.cxx
+++ b/filter/qa/cppunit/filters-pict-test.cxx
@@ -42,7 +42,7 @@ public:
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+ unsigned int, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
OUString pictURL()
{
@@ -64,7 +64,7 @@ public:
bool PictFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int)
+ unsigned int, SotClipboardFormatId, unsigned int)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/filter/qa/cppunit/filters-ppm-test.cxx
index 9cdafcd..31b4941 100644
--- a/filter/qa/cppunit/filters-ppm-test.cxx
+++ b/filter/qa/cppunit/filters-ppm-test.cxx
@@ -36,7 +36,7 @@ public:
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+ unsigned int, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
/**
* Ensure CVEs remain unbroken
@@ -50,7 +50,7 @@ public:
bool PpmFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int)
+ unsigned int, SotClipboardFormatId, unsigned int)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
diff --git a/filter/qa/cppunit/filters-psd-test.cxx b/filter/qa/cppunit/filters-psd-test.cxx
index 0da3a9fa..a453443 100644
--- a/filter/qa/cppunit/filters-psd-test.cxx
+++ b/filter/qa/cppunit/filters-psd-test.cxx
@@ -36,7 +36,7 @@ public:
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+ unsigned int, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
/**
* Ensure CVEs remain unbroken
@@ -50,7 +50,7 @@ public:
bool PsdFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int)
+ unsigned int, SotClipboardFormatId, unsigned int)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
diff --git a/filter/qa/cppunit/filters-ras-test.cxx b/filter/qa/cppunit/filters-ras-test.cxx
index cbc7bdf..66f23c9 100644
--- a/filter/qa/cppunit/filters-ras-test.cxx
+++ b/filter/qa/cppunit/filters-ras-test.cxx
@@ -36,7 +36,7 @@ public:
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+ unsigned int, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
/**
* Ensure CVEs remain unbroken
@@ -50,7 +50,7 @@ public:
bool RasFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int)
+ unsigned int, SotClipboardFormatId, unsigned int)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx
index 207e9ce..f723c35 100644
--- a/filter/qa/cppunit/filters-tga-test.cxx
+++ b/filter/qa/cppunit/filters-tga-test.cxx
@@ -36,7 +36,7 @@ public:
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+ unsigned int, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
/**
* Ensure CVEs remain unbroken
@@ -50,7 +50,7 @@ public:
bool TgaFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int)
+ unsigned int, SotClipboardFormatId, unsigned int)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx
index 2de6c8f..bb73d8f 100644
--- a/filter/qa/cppunit/filters-tiff-test.cxx
+++ b/filter/qa/cppunit/filters-tiff-test.cxx
@@ -36,7 +36,7 @@ public:
virtual bool load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int) SAL_OVERRIDE;
+ unsigned int, SotClipboardFormatId, unsigned int) SAL_OVERRIDE;
/**
* Ensure CVEs remain unbroken
@@ -50,7 +50,7 @@ public:
bool TiffFilterTest::load(const OUString &,
const OUString &rURL, const OUString &,
- unsigned int, unsigned int, unsigned int)
+ unsigned int, SotClipboardFormatId, unsigned int)
{
SvFileStream aFileStream(rURL, StreamMode::READ);
Graphic aGraphic;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 328fe2f..a3e880d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -153,7 +153,7 @@ static sal_uInt32 nMSOleObjCntr = 0;
/************************************************************************/
void Impl_OlePres::Write( SvStream & rStm )
{
- WriteClipboardFormat( rStm, FORMAT_GDIMETAFILE );
+ WriteClipboardFormat( rStm, SotClipboardFormatId::GDIMETAFILE );
rStm.WriteInt32( nJobLen + 4 ); // a TargetDevice that's always empty
if( nJobLen )
rStm.Write( pJob, nJobLen );
@@ -166,7 +166,7 @@ void Impl_OlePres::Write( SvStream & rStm )
sal_uLong nPos = rStm.Tell();
rStm.WriteInt32( 0 );
- if( GetFormat() == FORMAT_GDIMETAFILE && pMtf )
+ if( GetFormat() == SotClipboardFormatId::GDIMETAFILE && pMtf )
{
// Always to 1/100 mm, until Mtf-Solution found
// Assumption (no scaling, no origin translation)
@@ -6534,7 +6534,7 @@ bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFile &
sal_uInt16 nAspect = ASPECT_CONTENT;
sal_uLong nAdviseModes = 2;
- Impl_OlePres aEle( FORMAT_GDIMETAFILE );
+ Impl_OlePres aEle( SotClipboardFormatId::GDIMETAFILE );
// Convert the size in 1/100 mm
// If a not applicable MapUnit (device dependent) is used,
// SV tries to guess a best match for the right value
@@ -6729,13 +6729,13 @@ bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
if( pIds->nId )
{
// found!
- sal_uLong nCbFmt = SotExchange::RegisterFormatName( aSvrName );
+ SotClipboardFormatId nCbFmt = SotExchange::RegisterFormatName( aSvrName );
rDest->SetClass( SvGlobalName( pIds->nId, 0, 0, 0xc0,0,0,0,0,0,0,0x46 ), nCbFmt,
OUString::createFromAscii( pIds->pDspName ) );
}
else
{
- sal_uLong nCbFmt = SotExchange::RegisterFormatName( aSvrName );
+ SotClipboardFormatId nCbFmt = SotExchange::RegisterFormatName( aSvrName );
rDest->SetClass( SvGlobalName(), nCbFmt, aSvrName );
}
}
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 374707c..c647141 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list