[Libreoffice-commits] .: Branch 'libreoffice-4-0' - cui/source desktop/source fpicker/Library_fpicker.mk fpicker/Library_fps_odma.mk fpicker/Module_fpicker.mk fpicker/source framework/source officecfg/registry postprocess/packcomponents readlicense_oo/html readlicense_oo/txt Repository.mk scp2/source solenv/inc svl/qa svtools/inc svtools/source tools/inc tools/source ucb/Library_ucpodma1.mk ucb/Module_ucb.mk ucb/Package_odma_inc.mk ucb/source ucb/StaticLibrary_odma_lib.mk vcl/unx
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Dec 5 01:32:03 PST 2012
Repository.mk | 7
cui/source/options/optgdlg.cxx | 46
cui/source/options/optgdlg.hrc | 1
cui/source/options/optgdlg.hxx | 1
cui/source/options/optgdlg.src | 24
desktop/source/app/cmdlineargs.cxx | 9
fpicker/Library_fpicker.mk | 6
fpicker/Library_fps_odma.mk | 60
fpicker/Module_fpicker.mk | 1
fpicker/source/generic/fpicker.cxx | 4
fpicker/source/odma/ODMAFilePicker.cxx | 534 -----
fpicker/source/odma/ODMAFilePicker.hxx | 218 --
fpicker/source/odma/fps_odma.component | 16
fpicker/source/odma/fps_odma.cxx | 44
framework/source/uielement/recentfilesmenucontroller.cxx | 39
officecfg/registry/data/org/openoffice/ucb/Configuration.xcu | 11
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 13
postprocess/packcomponents/makefile.mk | 1
readlicense_oo/html/LICENSE.html | 42
readlicense_oo/txt/license.txt | 53
scp2/source/ooo/file_library_ooo.scp | 8
solenv/inc/libs.mk | 5
svl/qa/unit/test_URIHelper.cxx | 1
svtools/inc/svtools/miscopt.hxx | 3
svtools/source/config/miscopt.cxx | 50
tools/inc/tools/urlobj.hxx | 1
tools/source/fsys/urlobj.cxx | 27
ucb/Library_ucpodma1.mk | 58
ucb/Module_ucb.mk | 8
ucb/Package_odma_inc.mk | 33
ucb/StaticLibrary_odma_lib.mk | 41
ucb/source/ucp/odma/odma.h | 361 ---
ucb/source/ucp/odma/odma_content.cxx | 1053 -----------
ucb/source/ucp/odma/odma_content.hxx | 190 -
ucb/source/ucp/odma/odma_contentcaps.cxx | 236 --
ucb/source/ucp/odma/odma_contentprops.hxx | 79
ucb/source/ucp/odma/odma_datasupplier.cxx | 447 ----
ucb/source/ucp/odma/odma_datasupplier.hxx | 68
ucb/source/ucp/odma/odma_inputstream.cxx | 281 --
ucb/source/ucp/odma/odma_inputstream.hxx | 132 -
ucb/source/ucp/odma/odma_lib.cxx | 142 -
ucb/source/ucp/odma/odma_lib.hxx | 254 --
ucb/source/ucp/odma/odma_main.cxx | 89
ucb/source/ucp/odma/odma_provider.cxx | 593 ------
ucb/source/ucp/odma/odma_provider.hxx | 175 -
ucb/source/ucp/odma/odma_resultset.cxx | 92
ucb/source/ucp/odma/odma_resultset.hxx | 54
ucb/source/ucp/odma/odma_services.cxx | 66
ucb/source/ucp/odma/ucpodma1.component | 24
vcl/unx/kde/fpicker/kdefilepicker.cxx | 2
50 files changed, 11 insertions(+), 5692 deletions(-)
New commits:
commit 496e83089f44b9a0822c5fd9749e1c79d280fdf5
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Dec 5 08:52:15 2012 +0200
Bye bye ODMA
SUSE has no interest in it any longer, and I doubt anybody else has
either.
diff --git a/Repository.mk b/Repository.mk
index 9c3310e..c72d827 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -498,7 +498,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
lo-bootstrap \
) \
$(if $(filter $(OS),WNT), \
- ucpodma1 \
uwinapi \
) \
))
@@ -595,9 +594,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
$(if $(filter $(GUIBASE),aqua), \
fps_aqua \
) \
- $(if $(filter $(OS),WNT), \
- fps_odma \
- ) \
))
ifeq ($(OS),WNT)
@@ -683,9 +679,6 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
$(if $(filter $(OS),IOS), \
uno \
) \
- $(if $(filter $(OS),WNT), \
- odma_lib \
- ) \
))
ifeq ($(OS),WNT)
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 2e43087..098b550 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -192,7 +192,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ),
aFileDlgROImage ( this, CUI_RES( FI_FILEDLG_RO ) ),
aFileDlgCB ( this, CUI_RES( CB_FILEDLG ) ),
- aODMADlgCB ( this, CUI_RES( CB_ODMADLG ) ),
aPrintDlgFL ( this, CUI_RES( FL_PRINTDLG ) ),
aPrintDlgCB ( this, CUI_RES( CB_PRINTDLG ) ),
aDocStatusFL ( this, CUI_RES( FL_DOCSTATUS ) ),
@@ -216,33 +215,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
aPrintDlgCB.Hide();
#endif
-#ifdef WNT
- aFileDlgCB.SetToggleHdl( LINK( this, OfaMiscTabPage, OnFileDlgToggled ) );
-#else
- aODMADlgCB.Hide();
-#endif
-
- if (!aODMADlgCB.IsVisible())
- {
- // rearrange the following controls
- Point aNewPos = aPrintDlgFL.GetPosPixel();
- long nDelta = aNewPos.Y() - aODMADlgCB.GetPosPixel().Y();
-
- Window* pWins[] =
- {
- &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB,
- &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT
- };
- Window** pCurrent = pWins;
- const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
- for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent )
- {
- aNewPos = (*pCurrent)->GetPosPixel();
- aNewPos.Y() -= nDelta;
- (*pCurrent)->SetPosPixel( aNewPos );
- }
- }
-
if ( !aFileDlgCB.IsVisible() )
{
// rearrange the following controls
@@ -316,14 +288,6 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
aHelpAgentResetBtn.SetClickHdl( LINK( this, OfaMiscTabPage, HelpAgentResetHdl_Impl ) );
}
-#ifdef WNT
-IMPL_LINK_NOARG(OfaMiscTabPage, OnFileDlgToggled)
-{
- aODMADlgCB.Enable( !aFileDlgCB.IsChecked() );
- return 0;
-}
-#endif
-
// -----------------------------------------------------------------------
OfaMiscTabPage::~OfaMiscTabPage()
@@ -368,13 +332,6 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
bModified = sal_True;
}
- if ( aODMADlgCB.IsChecked() != aODMADlgCB.GetSavedValue() )
- {
- SvtMiscOptions aMiscOpt;
- aMiscOpt.SetTryODMADialog( aODMADlgCB.IsChecked() );
- bModified = sal_True;
- }
-
if ( aDocStatusCB.IsChecked() != aDocStatusCB.GetSavedValue() )
{
SvtPrintWarningOptions aPrintOptions;
@@ -423,9 +380,6 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
aSaveAlwaysCB.Check( aMiscOpt.IsSaveAlwaysAllowed() );
aSaveAlwaysCB.SaveValue();
- aODMADlgCB.Check( aMiscOpt.TryODMADialog() );
- aODMADlgCB.SaveValue();
-
SvtPrintWarningOptions aPrintOptions;
aDocStatusCB.Check(aPrintOptions.IsModifyDocumentOnPrintingAllowed());
aDocStatusCB.SaveValue();
diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 47b2446..fbf3c32 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -186,7 +186,6 @@
#define FT_GRAPHICOBJECTTIME_UNIT 58
#define FL_DOCSTATUS 60
#define CB_DOCSTATUS 61
-#define CB_ODMADLG 62
#define CB_SAVE_ALWAYS 74
#endif // #ifndef _SVX_OPTGDLG_HRC
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index a9074ee..718344b 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -45,7 +45,6 @@ private:
FixedLine aFileDlgFL;
ReadOnlyImage aFileDlgROImage;
CheckBox aFileDlgCB;
- CheckBox aODMADlgCB;
FixedLine aPrintDlgFL;
CheckBox aPrintDlgCB;
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 89f7124..9ed740d 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -85,52 +85,46 @@ TabPage OFA_TP_MISC
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
};
- CheckBox CB_ODMADLG
- {
- Pos = MAP_APPFONT( COL1, ROW6 );
- Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Show ODMA DMS dialogs first";
- };
FixedLine FL_PRINTDLG
{
- Pos = MAP_APPFONT( COL0, ROW7 );
+ Pos = MAP_APPFONT( COL0, ROW6 );
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
Text [ en-US ] = "Print dialogs";
};
CheckBox CB_PRINTDLG
{
- Pos = MAP_APPFONT( COL1, ROW8 );
+ Pos = MAP_APPFONT( COL1, ROW7 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Use %PRODUCTNAME ~dialogs";
};
FixedLine FL_DOCSTATUS
{
- Pos = MAP_APPFONT( COL0, ROW9 );
+ Pos = MAP_APPFONT( COL0, ROW8 );
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
Text [ en-US ] = "Document status";
};
CheckBox CB_DOCSTATUS
{
HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS";
- Pos = MAP_APPFONT( COL1, ROW10 );
+ Pos = MAP_APPFONT( COL1, ROW9 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Printing sets \"document modified\" status";
};
CheckBox CB_SAVE_ALWAYS
{
- Pos = MAP_APPFONT( COL1, ROW11 );
+ Pos = MAP_APPFONT( COL1, ROW10 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Allow to save document even when the document is not modified";
};
FixedLine FL_TWOFIGURE
{
- Pos = MAP_APPFONT( COL0, ROW12 );
+ Pos = MAP_APPFONT( COL0, ROW11 );
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
Text [ en-US ] = "Year (two digits)" ;
};
FixedText FT_INTERPRET
{
- Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW13) );
+ Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW12) );
Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT );
Text [ en-US ] = "Interpret as years between";
};
@@ -138,7 +132,7 @@ TabPage OFA_TP_MISC
{
HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE";
Border = TRUE ;
- Pos = MAP_APPFONT( COL4, ROW13 );
+ Pos = MAP_APPFONT( COL4, ROW12 );
Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
Minimum = 1583 ;
Maximum = 9857 ;
@@ -147,7 +141,7 @@ TabPage OFA_TP_MISC
};
FixedText FT_TOYEAR
{
- Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW13) );
+ Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW12) );
Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT );
Text [ en-US ] = "and " ;
};
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 8d1089a..2320a18 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -325,15 +325,6 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
}
else
{
- if( bOpenEvent || bViewEvent || bForceNewEvent || bForceOpenEvent )
- {
- if( aArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("::ODMA")) )
- {
- ::rtl::OUString sArg("vnd.sun.star.odma:/");
- sArg += aArg;
- aArg = sArg;
- }
- }
// handle this argument as a filename
if ( bOpenEvent )
{
diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk
index 0a85dd4..a5cfbb7 100644
--- a/fpicker/Library_fpicker.mk
+++ b/fpicker/Library_fpicker.mk
@@ -41,12 +41,6 @@ $(eval $(call gb_Library_use_libraries,fpicker,\
$(gb_UWINAPI) \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_static_libraries,fpicker,\
- odma_lib \
-))
-endif
-
$(eval $(call gb_Library_add_exception_objects,fpicker,\
fpicker/source/generic/fpicker \
))
diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk
deleted file mode 100644
index 17c0ff1..0000000
--- a/fpicker/Library_fps_odma.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Library_Library,fps_odma))
-
-$(eval $(call gb_Library_set_componentfile,fps_odma,fpicker/source/odma/fps_odma))
-
-$(eval $(call gb_Library_use_sdk_api,fps_odma))
-
-$(eval $(call gb_Library_use_libraries,fps_odma,\
- comphelper \
- cppu \
- cppuhelper \
- sal \
- svl \
- svt \
- tk \
- tl \
- ucbhelper \
- utl \
- vcl \
- $(gb_UWINAPI) \
-))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_use_static_libraries,fps_odma,\
- odma_lib \
-))
-endif
-
-$(eval $(call gb_Library_add_exception_objects,fps_odma,\
- fpicker/source/odma/fps_odma \
- fpicker/source/odma/ODMAFilePicker \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 8a4ac0a..311af4e 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -41,7 +41,6 @@ endif
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,fpicker,\
- Library_fps_odma \
Library_fps \
WinResTarget_fps \
))
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 43f5845..960e029 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/fpicker/source/generic/fpicker.cxx
@@ -32,7 +32,6 @@
#define GradientStyle_RECT BLA_GradientStyle_RECT
#include <windows.h>
#undef GradientStyle_RECT
-#include <odma_lib.hxx>
#endif
using css::uno::Reference;
@@ -58,9 +57,6 @@ static OUString FilePicker_getSystemPickerServiceName()
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.SystemFilePicker"));
#endif
#ifdef WNT
- if (SvtMiscOptions().TryODMADialog() && ::odma::DMSsAvailable()) {
- return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.ODMAFilePicker"));
- }
return OUString (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.ui.dialogs.Win32FilePicker"));
#endif
}
diff --git a/fpicker/source/odma/ODMAFilePicker.cxx b/fpicker/source/odma/ODMAFilePicker.cxx
deleted file mode 100644
index f94daee..0000000
--- a/fpicker/source/odma/ODMAFilePicker.cxx
+++ /dev/null
@@ -1,534 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- * Copyright 2010 Novell, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include "ODMAFilePicker.hxx"
-
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/StringPair.hpp>
-#include <com/sun/star/ui/dialogs/FilePreviewImageFormats.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-
-#include <comphelper/sequence.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <ucbhelper/content.hxx>
-#include <unotools/ucbhelper.hxx>
-
-#ifndef ODMA_LIB_HXX
-#include <windows.h>
-#include <odma_lib.hxx>
-#endif
-
-// using ----------------------------------------------------------------
-
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::util;
-using namespace ::utl;
-
-//------------------------------------------------------------------------------------
-// class ODMAFilePicker
-//------------------------------------------------------------------------------------
-ODMAFilePicker::ODMAFilePicker( const Reference < XComponentContext >& rxContext ) :
- cppu::WeakComponentImplHelper9<
- XFilterManager,
- XFilterGroupManager,
- XFilePickerControlAccess,
- XFilePickerNotifier,
- XFilePreview,
- XInitialization,
- XCancellable,
- XEventListener,
- XServiceInfo>( m_rbHelperMtx ),
- m_xContext( rxContext ),
- m_bMultiSelectionMode( sal_False ),
- m_aDefaultName( ),
- m_aFiles( ),
- m_nDialogKind( OPEN )
-{
- m_bUseDMS = ::odma::DMSsAvailable();
- m_xSystemFilePicker = rxContext->getServiceManager()->createInstanceWithContext(
- "com.sun.star.ui.dialogs.Win32FilePicker", rxContext);
-}
-
-// XExecutableDialog functions
-
-void SAL_CALL ODMAFilePicker::setTitle( const ::rtl::OUString& aTitle )
- throw (RuntimeException)
-{
- Reference< XExecutableDialog > xExecutableDialog( m_xSystemFilePicker, UNO_QUERY );
- xExecutableDialog->setTitle( aTitle);
-}
-
-inline bool is_current_process_window(HWND hwnd)
-{
- DWORD pid;
- GetWindowThreadProcessId(hwnd, &pid);
- return (pid == GetCurrentProcessId());
-}
-
-HWND choose_parent_window()
-{
- HWND hwnd_parent = GetForegroundWindow();
- if (!is_current_process_window(hwnd_parent))
- hwnd_parent = GetDesktopWindow();
- return hwnd_parent;
-}
-
-sal_Int16 SAL_CALL ODMAFilePicker::execute( )
- throw (RuntimeException)
-{
- ODMSTATUS status;
- ODMHANDLE handle;
- WORD count = 0;
- DWORD flags;
-
- status = NODMRegisterApp( &handle, ODM_API_VERSION, const_cast<char*>("sodma"), (DWORD) choose_parent_window( ), NULL );
- if (status == ODM_SUCCESS)
- {
- if (m_nDialogKind == OPEN)
- {
- const int MAXDOCS = 10;
- char docids[ODM_DOCID_MAX*MAXDOCS+1];
- WORD docidslen = sizeof( docids );
-
- flags = 0;
- if (m_bMultiSelectionMode)
- count = MAXDOCS;
- else
- count = 1;
- status = NODMSelectDocEx( handle, docids, &docidslen, &count, &flags, NULL );
- if (status == ODM_SUCCESS)
- {
- // GroupWise doesn't set docidslen or count, so
- // calculate number of document IDs manually
- char *p = docids;
- count = 0;
- while (*p) {
- count++;
- p += strlen( p ) + 1;
- }
- }
- else if (status == ODM_E_NOSUPPORT)
- {
- status = NODMSelectDoc( handle, docids, &flags );
- if (status == ODM_SUCCESS)
- count = 1;
- }
- NODMUnRegisterApp( handle );
- if (status == ODM_SUCCESS)
- {
- rtl::OUString *strings = new rtl::OUString[count];
- int i;
- char *p = docids;
-
- for (i = 0; i < count; i++) {
- // Insane API... the first element is a full URI, the rest
- // are just the "basenames" in the same "directory".
- if (i == 0)
- strings[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.odma:/" )) + rtl::OUString::createFromAscii( p );
- else
- strings[i] = rtl::OUString::createFromAscii( p );
- p += strlen( p );
- }
-
- m_aFiles = Sequence< rtl::OUString >( strings, count );
- delete[] strings;
- return ExecutableDialogResults::OK;
- }
- }
- else /* m_nDialogKind == SAVE */
- {
- char newdocid[ODM_DOCID_MAX+1];
-
- if (m_aDefaultName.getLength() == 0 ||
- !m_aDefaultName.matchIgnoreAsciiCaseAsciiL( "::ODMA\\", 7, 0 ))
- {
- char tempdocid[ODM_DOCID_MAX+1];
-
- status = NODMNewDoc( handle, tempdocid, ODM_SILENT, NULL, NULL );
- if (status == ODM_SUCCESS)
- status = NODMSaveAs( handle, tempdocid, newdocid, NULL, NULL, NULL );
- }
- else
- {
- rtl::OString sDefaultName = rtl::OUStringToOString( m_aDefaultName, RTL_TEXTENCODING_ASCII_US );
- status = NODMSaveAs( handle,
- const_cast<sal_Char*>( sDefaultName.getStr() ),
- newdocid, NULL, NULL, NULL );
- }
-
- NODMUnRegisterApp( handle );
- if (status == ODM_SUCCESS)
- {
- rtl::OUString s( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.odma:/" )) +
- rtl::OUString::createFromAscii( newdocid ) );
- // Create a Content for the odma URL so that
- // odma::ContentProvider will learn about the DOCID we
- // just created.
- ucbhelper::Content content( s, Reference< XCommandEnvironment >(), m_xContext );
- m_aFiles = Sequence< rtl::OUString >( &s, 1 );
- return ExecutableDialogResults::OK;
- }
- }
- }
- if (status == ODM_E_APPSELECT)
- {
- m_bUseDMS = sal_False;
-
- Reference< XExecutableDialog > xExecutableDialog( m_xSystemFilePicker, UNO_QUERY );
- return xExecutableDialog->execute();
- }
-
- // Fallback
- return ExecutableDialogResults::CANCEL;
-}
-
-// XFilePicker functions
-
-void SAL_CALL ODMAFilePicker::setMultiSelectionMode( sal_Bool bMode )
- throw( RuntimeException )
-{
- m_bMultiSelectionMode = bMode;
-
- Reference< XFilePicker > xFilePicker( m_xSystemFilePicker, UNO_QUERY );
- xFilePicker->setMultiSelectionMode( bMode );
-}
-
-void SAL_CALL ODMAFilePicker::setDefaultName( const rtl::OUString& aName )
- throw( RuntimeException )
-{
- // When editing a document from DMS, and doing Save As, this is
- // called twice, first with the complete DOCID, the second time
- // with the "extension" removed. Of course, this is bogus, as
- // DOCIDs should be treated as opaque strings, they don't have
- // "extensions".
-
- // In the GroupWise case a DOCID is like
- // ::ODMA\GRPWISE\FOO1.BAR.FOO-Bla_bla:12345.12 where the final
- // dot separates the version number, not an "extension".
- //
- // So ignore the second call.
- //
- // The second call without "extension" is done if the
- // XFilePickerControlAccess is set to have auto-extension turned
- // on. (See sfx2/source/dialog/filedlghelper.cxx:
- // FileDialogHelper_Impl::implInitializeFileName().) Thus we could
- // alternatively make sure that a getValue call to get
- // ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION returns
- // false. But that might be hard as we don't know in advance
- // whether the user will click the "use application dialog"
- // button. If so, we indeed do use auto-extensions.
- //
- // Yes, this is ugly, relying on knowing details on how this
- // function will be called.
-
- if ( m_aDefaultName.getLength() == 0 )
- m_aDefaultName = aName;
-
- Reference< XFilePicker > xFilePicker( m_xSystemFilePicker, UNO_QUERY );
- xFilePicker->setDefaultName( aName );
-}
-
-void SAL_CALL ODMAFilePicker::setDisplayDirectory( const rtl::OUString& aDirectory )
- throw( IllegalArgumentException, RuntimeException )
-{
- m_aDisplayDirectory = aDirectory;
-
- Reference< XFilePicker > xFilePicker( m_xSystemFilePicker, UNO_QUERY );
- xFilePicker->setDisplayDirectory( aDirectory );
-}
-
-rtl::OUString SAL_CALL ODMAFilePicker::getDisplayDirectory( )
- throw( RuntimeException )
-{
- if (m_bUseDMS)
- return m_aDisplayDirectory;
-
- Reference< XFilePicker > xFilePicker( m_xSystemFilePicker, UNO_QUERY );
- return xFilePicker->getDisplayDirectory();
-}
-
-Sequence< rtl::OUString > SAL_CALL ODMAFilePicker::getFiles( )
- throw( RuntimeException )
-{
- if (m_bUseDMS)
- return m_aFiles;
-
- Reference< XFilePicker > xFilePicker( m_xSystemFilePicker, UNO_QUERY );
- return xFilePicker->getFiles();
-}
-
-// XFilePickerControlAccess functions
-
-void SAL_CALL ODMAFilePicker::setValue( sal_Int16 nElementID,
- sal_Int16 nControlAction,
- const Any& rValue )
- throw( RuntimeException )
-{
- Reference< XFilePickerControlAccess > xFilePickerControlAccess( m_xSystemFilePicker, UNO_QUERY );
- xFilePickerControlAccess->setValue( nElementID, nControlAction, rValue );
-}
-
-Any SAL_CALL ODMAFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAction )
- throw( RuntimeException )
-{
- Reference< XFilePickerControlAccess > xFilePickerControlAccess( m_xSystemFilePicker, UNO_QUERY );
- return xFilePickerControlAccess->getValue( nElementID, nControlAction );
-}
-
-void SAL_CALL ODMAFilePicker::setLabel( sal_Int16 nLabelID, const rtl::OUString& rValue )
- throw ( RuntimeException )
-{
- Reference< XFilePickerControlAccess > xFilePickerControlAccess( m_xSystemFilePicker, UNO_QUERY );
- xFilePickerControlAccess->setLabel( nLabelID, rValue );
-}
-
-rtl::OUString SAL_CALL ODMAFilePicker::getLabel( sal_Int16 nLabelID )
- throw ( RuntimeException )
-{
- Reference< XFilePickerControlAccess > xFilePickerControlAccess( m_xSystemFilePicker, UNO_QUERY );
- return xFilePickerControlAccess->getLabel( nLabelID );
-}
-
-void SAL_CALL ODMAFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnable )
- throw( RuntimeException )
-{
- Reference< XFilePickerControlAccess > xFilePickerControlAccess( m_xSystemFilePicker, UNO_QUERY );
- xFilePickerControlAccess->enableControl( nElementID, bEnable );
-}
-
-// XFilePickerNotifier functions
-
-void SAL_CALL ODMAFilePicker::addFilePickerListener( const Reference< XFilePickerListener >& xListener )
- throw ( RuntimeException )
-{
- Reference< XFilePickerNotifier > xFilePickerNotifier( m_xSystemFilePicker, UNO_QUERY );
- xFilePickerNotifier->addFilePickerListener( xListener );
-}
-
-void SAL_CALL ODMAFilePicker::removeFilePickerListener( const Reference< XFilePickerListener >& xListener )
- throw ( RuntimeException )
-{
- Reference< XFilePickerNotifier > xFilePickerNotifier( m_xSystemFilePicker, UNO_QUERY );
- xFilePickerNotifier->removeFilePickerListener( xListener );
-}
-
-// XFilePreview functions
-
-Sequence< sal_Int16 > SAL_CALL ODMAFilePicker::getSupportedImageFormats( )
- throw ( RuntimeException )
-{
- Reference< XFilePreview > xFilePreview( m_xSystemFilePicker, UNO_QUERY );
- return xFilePreview->getSupportedImageFormats();
-}
-
-sal_Int32 SAL_CALL ODMAFilePicker::getTargetColorDepth( )
- throw ( RuntimeException )
-{
- Reference< XFilePreview > xFilePreview( m_xSystemFilePicker, UNO_QUERY );
- return xFilePreview->getTargetColorDepth();
-}
-
-sal_Int32 SAL_CALL ODMAFilePicker::getAvailableWidth( )
- throw ( RuntimeException )
-{
- Reference< XFilePreview > xFilePreview( m_xSystemFilePicker, UNO_QUERY );
- return xFilePreview->getAvailableWidth();
-}
-
-sal_Int32 SAL_CALL ODMAFilePicker::getAvailableHeight( )
- throw ( RuntimeException )
-{
- Reference< XFilePreview > xFilePreview( m_xSystemFilePicker, UNO_QUERY );
- return xFilePreview->getAvailableHeight();
-}
-
-void SAL_CALL ODMAFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage )
- throw ( IllegalArgumentException, RuntimeException )
-{
- Reference< XFilePreview > xFilePreview( m_xSystemFilePicker, UNO_QUERY );
- xFilePreview->setImage( aImageFormat, rImage);
-}
-
-sal_Bool SAL_CALL ODMAFilePicker::setShowState( sal_Bool bShowState )
- throw ( RuntimeException )
-{
- Reference< XFilePreview > xFilePreview( m_xSystemFilePicker, UNO_QUERY );
- return xFilePreview->setShowState( bShowState);
-}
-
-sal_Bool SAL_CALL ODMAFilePicker::getShowState( )
- throw ( RuntimeException )
-{
- Reference< XFilePreview > xFilePreview( m_xSystemFilePicker, UNO_QUERY );
- return xFilePreview->getShowState();
-}
-
-// XFilterGroupManager functions
-
-void SAL_CALL ODMAFilePicker::appendFilterGroup( const ::rtl::OUString& sGroupTitle,
- const Sequence< StringPair >& aFilters )
- throw ( IllegalArgumentException, RuntimeException )
-{
- Reference< XFilterGroupManager > xFilterGroupManager( m_xSystemFilePicker, UNO_QUERY );
- xFilterGroupManager->appendFilterGroup( sGroupTitle, aFilters );
-}
-
-// XFilterManager functions
-
-void SAL_CALL ODMAFilePicker::appendFilter( const rtl::OUString& aTitle,
- const rtl::OUString& aFilter )
- throw( IllegalArgumentException, RuntimeException )
-{
- Reference< XFilterManager > xFilterManager( m_xSystemFilePicker, UNO_QUERY );
- xFilterManager->appendFilter( aTitle, aFilter );
-}
-
-void SAL_CALL ODMAFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
- throw( IllegalArgumentException, RuntimeException )
-{
- Reference< XFilterManager > xFilterManager( m_xSystemFilePicker, UNO_QUERY );
- xFilterManager->setCurrentFilter( aTitle );
-}
-
-rtl::OUString SAL_CALL ODMAFilePicker::getCurrentFilter( )
- throw( RuntimeException )
-{
- Reference< XFilterManager > xFilterManager( m_xSystemFilePicker, UNO_QUERY );
- return xFilterManager->getCurrentFilter();
-}
-
-// XInitialization functions
-
-void SAL_CALL ODMAFilePicker::initialize( const Sequence< Any >& aArguments )
- throw ( Exception, RuntimeException )
-{
- if (aArguments.getLength( ) > 0)
- {
- Any aAny = aArguments[0];
-
- if ( (aAny.getValueType() == ::getCppuType((sal_Int16*)0)) ||
- (aAny.getValueType() == ::getCppuType((sal_Int8*)0)) )
- {
- sal_Int16 nTemplateId = -1;
- aAny >>= nTemplateId;
-
- switch (nTemplateId) {
- case TemplateDescription::FILEOPEN_SIMPLE:
- case TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE:
- case TemplateDescription::FILEOPEN_PLAY:
- case TemplateDescription::FILEOPEN_READONLY_VERSION:
- case TemplateDescription::FILEOPEN_LINK_PREVIEW:
- m_nDialogKind = OPEN;
- break;
- default:
- m_nDialogKind = SAVE;
- }
- }
- }
-
- Reference< XInitialization > xInitialization( m_xSystemFilePicker, UNO_QUERY );
- xInitialization->initialize( aArguments );
-}
-
-// XCancellable functions
-
-void SAL_CALL ODMAFilePicker::cancel( )
- throw( ::com::sun::star::uno::RuntimeException )
-{
- Reference< XCancellable > xCancellable( m_xSystemFilePicker, UNO_QUERY );
- xCancellable->cancel();
-}
-
-// XEventListener functions
-
-void SAL_CALL ODMAFilePicker::disposing( const ::com::sun::star::lang::EventObject& aEvent )
- throw( RuntimeException )
-{
- Reference< XEventListener > xEventListener( m_xSystemFilePicker, UNO_QUERY );
- xEventListener->disposing( aEvent );
-}
-
-// XServiceInfo functions
-
-rtl::OUString SAL_CALL ODMAFilePicker::getImplementationName( )
- throw( RuntimeException )
-{
- return impl_getStaticImplementationName();
-}
-
-sal_Bool SAL_CALL ODMAFilePicker::supportsService( const rtl::OUString& sServiceName )
- throw( RuntimeException )
-{
- Sequence< rtl::OUString > seqServiceNames = getSupportedServiceNames();
- const rtl::OUString* pArray = seqServiceNames.getConstArray();
- for ( sal_Int32 i = 0; i < seqServiceNames.getLength(); i++ )
- {
- if ( sServiceName == pArray[i] )
- {
- return sal_True ;
- }
- }
- return sal_False ;
-}
-
-Sequence< rtl::OUString > SAL_CALL ODMAFilePicker::getSupportedServiceNames( )
- throw( RuntimeException )
-{
- return impl_getStaticSupportedServiceNames();
-}
-
-Sequence< rtl::OUString > ODMAFilePicker::impl_getStaticSupportedServiceNames( )
-{
- Sequence< OUString > s(1);
- s[0] = "com.sun.star.ui.dialogs.SystemFilePicker";
- return s;
-}
-
-rtl::OUString ODMAFilePicker::impl_getStaticImplementationName( )
-{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svtools.ODMAFilePicker" ));
-}
-
-Reference< XInterface > SAL_CALL ODMAFilePicker::impl_createInstance(
- const Reference< XComponentContext >& rxContext)
- throw( Exception )
-{
- return Reference< XInterface >( *new ODMAFilePicker( rxContext ) );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/odma/ODMAFilePicker.hxx b/fpicker/source/odma/ODMAFilePicker.hxx
deleted file mode 100644
index dee0bdd..0000000
--- a/fpicker/source/odma/ODMAFilePicker.hxx
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- * Copyright 2010 Novell, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef INCLUDED_ODMA_FILEPICKER_HXX
-#define INCLUDED_ODMA_FILEPICKER_HXX
-
-#include <cppuhelper/compbase9.hxx>
-
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
-#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
-#include <com/sun/star/util/XCancellable.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-
-// class ODMAFilePicker ---------------------------------------------------
-
-class ODMAFilePicker :
- public cppu::WeakComponentImplHelper9<
- ::com::sun::star::ui::dialogs::XFilterManager,
- ::com::sun::star::ui::dialogs::XFilterGroupManager,
- ::com::sun::star::ui::dialogs::XFilePickerControlAccess,
- ::com::sun::star::ui::dialogs::XFilePickerNotifier,
- ::com::sun::star::ui::dialogs::XFilePreview,
- ::com::sun::star::lang::XInitialization,
- ::com::sun::star::util::XCancellable,
- ::com::sun::star::lang::XEventListener,
- ::com::sun::star::lang::XServiceInfo >
-{
-private:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
- m_xContext;
- sal_Bool m_bUseDMS;
- sal_Bool m_bMultiSelectionMode;
- rtl::OUString m_aDefaultName;
- rtl::OUString m_aDisplayDirectory;
- ::com::sun::star::uno::Sequence< rtl::OUString > m_aFiles;
- enum { OPEN, SAVE } m_nDialogKind;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xSystemFilePicker;
-
-protected:
- ::osl::Mutex m_rbHelperMtx;
-
-public:
-
- ODMAFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
-
- // XFilterManager functions
-
- virtual void SAL_CALL appendFilter( const ::rtl::OUString& aTitle,
- const ::rtl::OUString& aFilter )
- throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-
- virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString& aTitle )
- throw( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException );
-
- virtual ::rtl::OUString SAL_CALL getCurrentFilter( )
- throw( ::com::sun::star::uno::RuntimeException );
-
- // XFilterGroupManager functions
-
- virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString& sGroupTitle,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException );
-
- // XFilePickerControlAccess functions
-
- virtual void SAL_CALL setValue( sal_Int16 nControlID,
- sal_Int16 nControlAction,
- const ::com::sun::star::uno::Any& aValue )
- throw( ::com::sun::star::uno::RuntimeException );
-
- virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlID,
- sal_Int16 nControlAction )
- throw( ::com::sun::star::uno::RuntimeException );
-
- virtual void SAL_CALL setLabel( sal_Int16 nControlID,
- const ::rtl::OUString& aValue )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlID )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- virtual void SAL_CALL enableControl( sal_Int16 nControlID,
- sal_Bool bEnable )
- throw( ::com::sun::star::uno::RuntimeException );
-
- // XFilePicker functions
-
- virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
- throw( ::com::sun::star::uno::RuntimeException );
-
- virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName )
- throw( ::com::sun::star::uno::RuntimeException );
-
- virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory )
- throw( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException );
-
- virtual ::rtl::OUString SAL_CALL getDisplayDirectory( )
- throw( ::com::sun::star::uno::RuntimeException );
-
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles( )
- throw( ::com::sun::star::uno::RuntimeException );
-
- // XExecutableDialog functions
-
- virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle )
- throw (::com::sun::star::uno::RuntimeException);
-
- virtual sal_Int16 SAL_CALL execute( )
- throw (::com::sun::star::uno::RuntimeException);
-
- // XFilePickerNotifier functions
-
- virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- // XFilePreview functions
-
- virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- virtual sal_Int32 SAL_CALL getTargetColorDepth( )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- virtual sal_Int32 SAL_CALL getAvailableWidth( )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- virtual sal_Int32 SAL_CALL getAvailableHeight( )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- virtual void SAL_CALL setImage( sal_Int16 aImageFormat,
- const ::com::sun::star::uno::Any& aImage )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException );
-
- virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- virtual sal_Bool SAL_CALL getShowState( )
- throw ( ::com::sun::star::uno::RuntimeException );
-
- // XInitialization functions
-
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException );
-
- // XCancellable functions
-
- virtual void SAL_CALL cancel( )
- throw( ::com::sun::star::uno::RuntimeException );
-
- // XEventListener functions
-
- using cppu::WeakComponentImplHelperBase::disposing;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException );
-
- // XServiceInfo functions
-
- virtual ::rtl::OUString SAL_CALL getImplementationName( )
- throw( ::com::sun::star::uno::RuntimeException );
-
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName )
- throw( ::com::sun::star::uno::RuntimeException );
-
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
- throw( ::com::sun::star::uno::RuntimeException );
-
- /* Helper for XServiceInfo */
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames( );
- static ::rtl::OUString impl_getStaticImplementationName( );
-
- /* Helper for registry */
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_createInstance ( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
- throw( ::com::sun::star::uno::Exception );
-};
-
-#endif // INCLUDED_ODMA_FILEPICKER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/odma/fps_odma.component b/fpicker/source/odma/fps_odma.component
deleted file mode 100644
index 62e1577..0000000
--- a/fpicker/source/odma/fps_odma.component
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
--->
-
-<component loader="com.sun.star.loader.SharedLibrary" prefix="fps_odma"
- xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.svtools.ODMAFilePicker">
- <service name="com.sun.star.ui.dialogs.SystemFilePicker"/>
- </implementation>
-</component>
diff --git a/fpicker/source/odma/fps_odma.cxx b/fpicker/source/odma/fps_odma.cxx
deleted file mode 100644
index c8dce67..0000000
--- a/fpicker/source/odma/fps_odma.cxx
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sal/types.h"
-
-#include "cppuhelper/implementationentry.hxx"
-
-#include "ODMAFilePicker.hxx"
-
-static cppu::ImplementationEntry g_entries[] =
-{
- {
- ODMAFilePicker::impl_createInstance,
- ODMAFilePicker::impl_getStaticImplementationName,
- ODMAFilePicker::impl_getStaticSupportedServiceNames,
- cppu::createSingleComponentFactory, 0, 0
- },
- { 0, 0, 0, 0, 0, 0 }
-};
-
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL fps_odma_component_getFactory (
- const sal_Char * pImplementationName, void * pServiceManager, void * pRegistryKey)
-{
- return cppu::component_getFactoryHelper (
- pImplementationName, pServiceManager, pRegistryKey, g_entries);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index 6466f22..2603b2f 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -42,7 +42,6 @@
#define GradientStyle_RECT BLA_GradientStyle_RECT
#include <windows.h>
#undef GradientStyle_RECT
-#include <odma_lib.hxx>
#endif
#include <osl/mutex.hxx>
@@ -188,44 +187,6 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
else
aMenuTitle = aSystemPath;
}
-#if 0 // Please don't remove this commented-out code just yet,
- // we can try to resurrect it later in case somebody complains
-#ifdef WNT
- else if ( aURL.GetProtocol() == INET_PROT_VND_SUN_STAR_ODMA && ::odma::DMSsAvailable ())
- {
- String aShortTitle = m_aRecentFilesItems.at( i ).aTitle;
-
- // This is against all rules for using
- // proper abstraction layers and whatnot.
- // But figuring out how to do it "right"
- // would have taken the whole week.
- // So just call the odma_lib functions...
- // (odma_lib is a thin layer on
- // top of the ODMA32 DLL)
-
- static ODMHANDLE handle = NULL;
- static sal_Bool beenhere = sal_False;
- ODMSTATUS status;
-
- if ( ! beenhere )
- {
- status = NODMRegisterApp( &handle, ODM_API_VERSION, "sodma", NULL, NULL );
- beenhere = sal_True;
- }
-
- if ( handle != NULL )
- {
- rtl::OUString s = aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_MS_1252 );
- s = s.copy( strlen ( "vnd.sun.star.odma:/" ) );
- char title[47];
- status = NODMGetDocInfo( handle, rtl::OUStringToOString( s, RTL_TEXTENCODING_MS_1252 ).pData->buffer, ODM_NAME, title, sizeof ( title ) );
- aShortTitle = String::CreateFromAscii( title );
- }
- aMenuTitle += aShortTitle;
- aTipHelpText = aURLString;
- }
-#endif
-#endif
else
{
// Use INetURLObject to abbreviate all other URLs
diff --git a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
index 1fe1b8c..521c83a 100644
--- a/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
+++ b/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu
@@ -177,17 +177,6 @@
<value/>
</prop>
</node>
- <node oor:name="Provider42" oor:op="replace" install:module="win">
- <prop oor:name="ServiceName">
- <value>com.sun.star.ucb.ODMAContentProvider</value>
- </prop>
- <prop oor:name="URLTemplate">
- <value>vnd.sun.star.odma</value>
- </prop>
- <prop oor:name="Arguments">
- <value/>
- </prop>
- </node>
<node oor:name="Provider43" oor:op="replace">
<prop oor:name="ServiceName">
<value>com.sun.star.ucb.CmisContentProvider</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f847e0e..3910287 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6557,19 +6557,6 @@
</info>
<value>false</value>
</prop>
- <prop oor:name="TryODMADialog" oor:type="xs:boolean" oor:nillable="false">
- <info>
- <author>tml</author>
- <desc>Determines whether to show the document creation and selection
- of the machine's default ODMA (Open Document Management Architecture)
- DMS (Document Management System). If true, and the machine has a DMS
- available, the DMS's dialog will be displayed. That dialog then gives
- the opportunity to use the application's dialog instead, which means
- the normal system file and folder pickers will be displayed. Relevant
- only on Windows.</desc>
- </info>
- <value>false</value>
- </prop>
<prop
oor:name="DisableUICustomization" oor:type="xs:boolean"
oor:nillable="false">
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 3caa0e7..fa3231c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -337,7 +337,6 @@ my_components += \
component/dtrans/util/dnd \
component/dtrans/util/ftransl \
component/dtrans/util/sysdtrans \
- component/fpicker/source/odma/fps_odma \
component/fpicker/source/win32/fps \
component/shell/source/backends/wininetbe/wininetbe1 \
component/shell/source/win32/simplemail/smplmail \
diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/html/LICENSE.html
index 8f5be10..dadacdf 100644
--- a/readlicense_oo/html/LICENSE.html
+++ b/readlicense_oo/html/LICENSE.html
@@ -5083,48 +5083,6 @@ advertising or publicity pertaining to the software without specific,
written prior permission. Title to copyright in this software and any
associated documentation will at all times remain with copyright
holders.</P>
-<H2 CLASS="western">ODMA header</H2>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">The
-following software may be included in this product: odma.h -
-Definitions, prototypes, etc. for Open Document Managment API (ODMA)
-version 2.0. Use of any of this software is governed by the terms of
-the license below:</P>
-<H3 CLASS="western">OPEN DOCUMENT MANAGEMENT API LICENSE 1.0</H3>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">ODMA
-2.0 SPECIFICATIONS AND SOFTWARE</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
-© 1994-1998 AIIM International. All Right Reserved.</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">LICENSE:</P>
-<UL>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Redistribution and use in source and binary forms, with or without
- modifications, are permitted provided that the following conditions
- are met:</P>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.</P>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.</P>
- <LI><P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">
- Neither the name of AIIM International nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.</P>
-</UL>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">DISCLAIMER:</P>
-<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">THIS
-SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</P>
<H1 CLASS="western" STYLE="page-break-before: always"><A NAME="__RefHeading__12227_1300998327"></A><A NAME="2.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="9.GNU Lesser General Public License Version 3|outline"></A><A NAME="4.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAM
E="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="3.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="7.GNU Lesser General Public Licens
e Version 3|outline"></A><A NAME="7.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A><A NAME="1.GNU Lesser General Public License Version 3|outline"></A>
GNU Lesser General Public License Version 3</H1>
<P CLASS="western" STYLE="margin-top: 0.3cm; margin-bottom: 0.3cm">Copyright
diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/txt/license.txt
index 7234c17..2ea1663 100644
--- a/readlicense_oo/txt/license.txt
+++ b/readlicense_oo/txt/license.txt
@@ -5160,59 +5160,6 @@ MathML DTD
associated documentation will at all times remain with copyright
holders.
-ODMA header
-
- The following software may be included in this product:
- odma.h - Definitions, prototypes, etc. for Open Document Managment API
- (ODMA) version 2.0. Use of any of this software is governed by the terms
- of the license below:
-
- OPEN DOCUMENT MANAGEMENT API LICENSE 1.0
-
- ODMA 2.0 SPECIFICATIONS AND SOFTWARE
- ------------------------------------
-
- Copyright © 1994-1998 AIIM International
- All Right Reserved
-
-LICENSE:
-
- Redistribution and use in source and binary forms, with or
- without modifications, are permitted provided that the
- following conditions are met:
-
- * Redistributions of source code must retain the above
- copyright notice, this list of conditions and the
- following disclaimer.
-
- * Redistributions in binary form must reproduce the
- above copyright notice, this list of conditions and
- the following disclaimer in the documentation and/or
- other materials provided with the distribution.
-
- * Neither the name of AIIM International nor the names
- of its contributors may be used to endorse or promote
- products derived from this software without specific
- prior written permission.
-
-DISCLAIMER:
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-
GNU Lesser General Public License Version 3
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 8e94377..86dde44 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -523,10 +523,6 @@ End
#endif
#endif
-#ifdef WNT
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_ODMA, fps_odma.uno )
-#endif
-
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
@@ -1334,10 +1330,6 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
-#ifdef WNT
-SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
-#endif
-
SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
File gid_File_Lib_Lnth
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 5764d0e..17bead8 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -35,10 +35,6 @@ COMID_WITH_VERSION = $(UDK_MAJOR)$(COMID)
COMID_WITH_VERSION = $(COMID)
.ENDIF
-.IF "$(GUI)" == "WNT"
-ODMA_LIB_LIB=-lodma_lib
-.ENDIF
-
#
#externe libs in plattform.mk
#
@@ -323,7 +319,6 @@ CURLLIB+=$(ZLIB3RDLIB)
.ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
-ODMA_LIB_LIB=odma_lib.lib
AWTLIB*=jawt.lib
AVMEDIALIB=iavmedia.lib
ICUINLIB=icuin.lib
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index 1f16193..9fd68aa 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -377,7 +377,6 @@ void Test::testFindFirstURLInText() {
{ "vnd.sun.star.cmd:", 0, 0, 0 },
{ "vnd.sun.star.help:", 0, 0, 0 },
{ "vnd.sun.star.hier:", 0, 0, 0 },
- { "vnd.sun.star.odma:", 0, 0, 0 },
{ "vnd.sun.star.pkg:", 0, 0, 0 },
{ "vnd.sun.star.script:", 0, 0, 0 },
{ "vnd.sun.star.webdav:", 0, 0, 0 },
diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index 9352d04..0d2ea73 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.hxx
@@ -77,9 +77,6 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
void SetUseSystemFileDialog( sal_Bool bSet );
sal_Bool IsUseSystemFileDialogReadOnly() const;
- sal_Bool TryODMADialog() const;
- void SetTryODMADialog( sal_Bool bSet );
-
sal_Bool DisableUICustomization() const;
sal_Bool IsPluginsEnabled() const;
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 53c1231..c3666d0 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -55,8 +55,6 @@ using namespace ::com::sun::star;
#define PROPERTYHANDLE_SYMBOLSTYLE 4
#define PROPERTYNAME_USESYSTEMPRINTDIALOG ASCII_STR("UseSystemPrintDialog")
#define PROPERTYHANDLE_USESYSTEMPRINTDIALOG 5
-#define PROPERTYNAME_TRYODMADIALOG ASCII_STR("TryODMADialog")
-#define PROPERTYHANDLE_TRYODMADIALOG 6
#define PROPERTYNAME_SHOWLINKWARNINGDIALOG ASCII_STR("ShowLinkWarningDialog")
#define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
#define PROPERTYNAME_DISABLEUICUSTOMIZATION ASCII_STR("DisableUICustomization")
@@ -76,8 +74,6 @@ class SvtMiscOptions_Impl : public ConfigItem
::std::list<Link> aList;
sal_Bool m_bUseSystemFileDialog;
sal_Bool m_bIsUseSystemFileDialogRO;
- sal_Bool m_bTryODMADialog;
- sal_Bool m_bIsTryODMADialogRO;
sal_Bool m_bPluginsEnabled;
sal_Bool m_bIsPluginsEnabledRO;
sal_Int16 m_nSymbolsSize;
@@ -149,15 +145,6 @@ class SvtMiscOptions_Impl : public ConfigItem
inline sal_Bool IsUseSystemFileDialogReadOnly() const
{ return m_bIsUseSystemFileDialogRO; }
- inline sal_Bool TryODMADialog() const
- { return m_bTryODMADialog; }
-
- inline void SetTryODMADialog( sal_Bool bSet )
- { m_bTryODMADialog = bSet; SetModified(); }
-
- inline sal_Bool IsTryUseODMADialogReadOnly() const
- { return m_bIsTryODMADialogRO; }
-
inline sal_Bool DisableUICustomization() const
{ return m_bDisableUICustomization; }
@@ -272,8 +259,6 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
, m_bUseSystemFileDialog( sal_False )
, m_bIsUseSystemFileDialogRO( sal_False )
- , m_bTryODMADialog( sal_False )
- , m_bIsTryODMADialogRO( sal_False )
, m_bPluginsEnabled( sal_False )
, m_bIsPluginsEnabledRO( sal_False )
, m_nSymbolsSize( 0 )
@@ -359,16 +344,6 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
break;
}
- case PROPERTYHANDLE_TRYODMADIALOG :
- {
- if( !(seqValues[nProperty] >>= m_bTryODMADialog) )
- {
- OSL_FAIL("Wrong type of \"Misc\\TryODMADialog\"!" );
- }
- m_bIsTryODMADialogRO = seqRO[nProperty];
- break;
- }
-
case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG :
{
if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) )
@@ -500,13 +475,6 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
}
}
break;
- case PROPERTYHANDLE_TRYODMADIALOG : {
- if( !(seqValues[nProperty] >>= m_bTryODMADialog) )
- {
- OSL_FAIL("Wrong type of \"Misc\\TryODMADialog\"!" );
- }
- }
- break;
case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG : {
if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) )
{
@@ -664,13 +632,6 @@ void SvtMiscOptions_Impl::Commit()
break;
}
- case PROPERTYHANDLE_TRYODMADIALOG :
- {
- if ( !m_bIsTryODMADialogRO )
- seqValues[nProperty] <<= m_bTryODMADialog;
- break;
- }
-
case PROPERTYHANDLE_SYMBOLSTYLE :
{
if ( !m_bIsSymbolsStyleRO )
@@ -732,7 +693,6 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
PROPERTYNAME_USESYSTEMFILEDIALOG,
PROPERTYNAME_SYMBOLSTYLE,
PROPERTYNAME_USESYSTEMPRINTDIALOG,
- PROPERTYNAME_TRYODMADIALOG,
PROPERTYNAME_SHOWLINKWARNINGDIALOG,
PROPERTYNAME_DISABLEUICUSTOMIZATION,
PROPERTYNAME_ALWAYSALLOWSAVE,
@@ -805,16 +765,6 @@ sal_Bool SvtMiscOptions::IsUseSystemFileDialogReadOnly() const
return m_pDataContainer->IsUseSystemFileDialogReadOnly();
}
-sal_Bool SvtMiscOptions::TryODMADialog() const
-{
- return m_pDataContainer->TryODMADialog();
-}
-
-void SvtMiscOptions::SetTryODMADialog( sal_Bool bEnable )
-{
- m_pDataContainer->SetTryODMADialog( bEnable );
-}
-
sal_Bool SvtMiscOptions::IsPluginsEnabled() const
{
return m_pDataContainer->IsPluginsEnabled();
diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 4b80eaa..2f43199 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.hxx
@@ -94,7 +94,6 @@ enum INetProtocol
INET_PROT_LDAP = 23,
INET_PROT_DB = 24,
INET_PROT_VND_SUN_STAR_CMD = 25,
- INET_PROT_VND_SUN_STAR_ODMA = 26,
INET_PROT_TELNET = 27,
INET_PROT_VND_SUN_STAR_EXPAND = 28,
INET_PROT_VND_SUN_STAR_TDOC = 29,
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index b70f3b7..f6e9db4 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -216,8 +216,6 @@ using namespace com::sun;
uric_no_slash = unreserved / escaped / ";" / "?" / ":" / "@" / "&" / "=" / "+" / "$" / ","
- ; private
- vnd-sun-star-url = "VND.SUN.STAR.ODMA:" ["/" *uric_no_slash]
uric_no_slash = unreserved / escaped / ";" / "?" / ":" / "@" / "&" / "=" / "+" / "$" / ","
@@ -388,8 +386,7 @@ static INetURLObject::SchemeInfo const aSchemeInfoMap[INET_PROT_END]
false },
{ "vnd.sun.star.cmd", "vnd.sun.star.cmd:", 0, false, false, false,
false, false, false, false, false },
- { "vnd.sun.star.odma", "vnd.sun.star.odma:", 0, false, false, false,
- false, false, false, true, false },
+ { "", "", 0, false, false, false, false, true, true, true, false }, // Placeholder for removed 26: ODMA
{ "telnet", "telnet://", 23, true, true, false, true, true, true, true,
false },
{ "vnd.sun.star.expand", "vnd.sun.star.expand:", 0, false, false, false,
@@ -2189,8 +2186,6 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *&
PrefixInfo::OFFICIAL },
{ "vnd.sun.star.hier:", 0, INET_PROT_VND_SUN_STAR_HIER,
PrefixInfo::OFFICIAL },
- { "vnd.sun.star.odma:", 0, INET_PROT_VND_SUN_STAR_ODMA,
- PrefixInfo::OFFICIAL },
{ "vnd.sun.star.pkg:", 0, INET_PROT_VND_SUN_STAR_PKG,
PrefixInfo::OFFICIAL },
{ "vnd.sun.star.tdoc:", 0, INET_PROT_VND_SUN_STAR_TDOC,
@@ -3338,26 +3333,6 @@ bool INetURLObject::parsePath(INetProtocol eScheme,
break;
}
- case INET_PROT_VND_SUN_STAR_ODMA:
- if (pPos < pEnd)
- {
- if (*pPos == '/')
- ++pPos;
- else
- return false;
- }
- aTheSynPath.append(sal_Unicode('/'));
- while (pPos < pEnd && *pPos != nFragmentDelimiter)
- {
- EscapeType eEscapeType;
- sal_uInt32 nUTF32 = getUTF32(pPos, pEnd, bOctets,
- '%', eMechanism,
- eCharset, eEscapeType);
- appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets,
- PART_URIC_NO_SLASH, '%', eCharset, true);
- }
- break;
-
case INET_PROT_TELNET:
if (pPos < pEnd)
{
diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk
deleted file mode 100644
index 1c0f950..0000000
--- a/ucb/Library_ucpodma1.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Library_Library,ucpodma1))
-
-$(eval $(call gb_Library_set_componentfile,ucpodma1,ucb/source/ucp/odma/ucpodma1))
-
-$(eval $(call gb_Library_use_sdk_api,ucpodma1))
-
-$(eval $(call gb_Library_use_libraries,ucpodma1,\
- comphelper \
- cppu \
- cppuhelper \
- sal \
- salhelper \
- ucbhelper \
- $(gb_UWINAPI) \
-))
-
-$(eval $(call gb_Library_use_static_libraries,ucpodma1,\
- odma_lib \
-))
-
-$(eval $(call gb_Library_add_exception_objects,ucpodma1,\
- ucb/source/ucp/odma/odma_contentcaps \
- ucb/source/ucp/odma/odma_content \
- ucb/source/ucp/odma/odma_datasupplier \
- ucb/source/ucp/odma/odma_inputstream \
- ucb/source/ucp/odma/odma_provider \
- ucb/source/ucp/odma/odma_resultset \
- ucb/source/ucp/odma/odma_services \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk
index f84cc84..6eb5522 100644
--- a/ucb/Module_ucb.mk
+++ b/ucb/Module_ucb.mk
@@ -42,14 +42,6 @@ $(eval $(call gb_Module_add_targets,ucb,\
Library_ucptdoc1 \
))
-ifeq ($(OS),WNT)
-$(eval $(call gb_Module_add_targets,ucb,\
- Library_ucpodma1 \
- Package_odma_inc \
- StaticLibrary_odma_lib \
-))
-endif
-
ifneq ($(DISABLE_NEON),TRUE)
$(eval $(call gb_Module_add_targets,ucb,\
Library_ucpdav1 \
diff --git a/ucb/Package_odma_inc.mk b/ucb/Package_odma_inc.mk
deleted file mode 100644
index e9cd52a..0000000
--- a/ucb/Package_odma_inc.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,ucb_odma_inc,$(SRCDIR)/ucb/source/ucp/odma))
-
-$(eval $(call gb_Package_add_file,ucb_odma_inc,inc/odma.h,odma.h))
-$(eval $(call gb_Package_add_file,ucb_odma_inc,inc/odma_lib.hxx,odma_lib.hxx))
-
-# vim: set noet sw=4 ts=4:
diff --git a/ucb/StaticLibrary_odma_lib.mk b/ucb/StaticLibrary_odma_lib.mk
deleted file mode 100644
index d6100b6..0000000
--- a/ucb/StaticLibrary_odma_lib.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,odma_lib))
-
-$(eval $(call gb_StaticLibrary_use_package,odma_lib,ucb_odma_inc))
-
-$(eval $(call gb_StaticLibrary_use_api,odma_lib,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,odma_lib,\
- ucb/source/ucp/odma/odma_lib \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/ucb/source/ucp/odma/odma.h b/ucb/source/ucp/odma/odma.h
deleted file mode 100644
index c75f21c..0000000
--- a/ucb/source/ucp/odma/odma.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* odma.h - Definitions, prototypes, etc. for Open Document Managment API
- (ODMA) version 2.0.
- OPEN DOCUMENT MANAGEMENT API LICENSE 1.0
-
- ODMA 2.0 SPECIFICATIONS AND SOFTWARE
- ------------------------------------
-
- Copyright © 1994-1998 AIIM International
-
-LICENSE:
-
- Redistribution and use in source and binary forms, with or
- without modifications, are permitted provided that the
- following conditions are met:
-
- * Redistributions of source code must retain the above
- copyright notice, this list of conditions and the
- following disclaimer.
-
- * Redistributions in binary form must reproduce the
- above copyright notice, this list of conditions and
- the following disclaimer in the documentation and/or
- other materials provided with the distribution.
-
- * Neither the name of AIIM International nor the names
- of its contributors may be used to endorse or promote
- products derived from this software without specific
- prior written permission.
-
-DISCLAIMER:
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- COPYRIGHT (C) 1994, 1995
- AIIM International
- All Right Reserved
-*/
-
-#ifndef ODMA_H
-#define ODMA_H
-
-/* Type definitions */
-typedef LPVOID ODMHANDLE;
-typedef LPSTR (*ODMSAVEASCALLBACK)(DWORD dwEnvData, LPSTR lpszFormat, LPVOID pInstanceData);
-typedef int ODMSTATUS;
-
-/* Constants */
-#define ODM_API_VERSION 200 /* Version of the API */
-
-#ifdef WIN32
- #define ODM_DOCID_MAX 255 /* Win32 */
-
-#elif defined( _WINDOWS_ ) || defined( _MSDOS )
- #define ODM_DOCID_MAX 80 /* Windows 3.x */
-
-#else
- #define ODM_DOCID_MAX 255 /* Other platforms */
-#endif
-
-#define ODM_DMSID_MAX 9 /* Max length of a DMS ID including the
- terminating NULL character. */
-
-#define ODM_APPID_MAX 16 /* Max length of a application ID including
- the terminating NULL character. */
-
-// ODMA 2.0
-#define ODM_QUERYID_MAX 255 // Max length of a query ID including
- // the terminating NULL character.
-
-#define ODM_FORMAT_MAX 81 // Max length of a format including
- // the terminating NULL character.
-
-// Maximum length of a filename returned by ODMA including the terminating
-// NULL character. Platform dependent.
-
-#ifdef WIN32
- #define ODM_FILENAME_MAX 255 /* Win32 */
-
-#elif defined( _WINDOWS_ ) || defined( _MSDOS )
- #define ODM_FILENAME_MAX 128 /* Windows 3.x */
-
-#elif defined( unix ) || defined( _UNIX )
- #define ODM_FILENAME_MAX 1024 /* Unix */
-
-#else
- #define ODM_FILENAME_MAX 255 /* Other platforms */
-#endif
-
-
-/* Common format type names */
-#define ODM_FORMAT_TEXT "Text"
-#define ODM_FORMAT_RTF "Rich text format"
-#define ODM_FORMAT_DCA "DCA RFT" /* IBM DCA Rich Format Text */
-#define ODM_FORMAT_TIFF "Tiff"
-#define ODM_FORMAT_GIF "Gif" /* Compuserve Graphics Interchange Format */
-#define ODM_FORMAT_BMP "Windows bitmap"
-#define ODM_FORMAT_PCX "PCX"
-#define ODM_FORMAT_CGM "CGM" /* Computer Graphics Metafile */
-#define ODM_FORMAT_EXE "Executable file"
-#define ODM_FORMAT_PCL "PCL" /* HP Printer Control Language */
-#define ODM_FORMAT_PS "PostScript"
-
-
-/* Error returns */
-#define ODM_SUCCESS 0 // Success!
-#define ODM_E_FAIL 1 /* Unspecified failure */
-#define ODM_E_CANCEL 2 /* Action was cancelled at user's request */
-#define ODM_E_NODMS 3 /* DMS not registered */
-#define ODM_E_CANTINIT 4 /* DMS failed to initalize */
-#define ODM_E_VERSION 5 /* DMS doesn't support the requested
- version of ODMA */
-#define ODM_E_APPSELECT 6 /* User has indicated that he wants to use
- the application's file selection
- capabilities rather than those of the
- DMS. */
-#define ODM_E_USERINT 7 /* Requested action cannot be performed
- without user interaction, but silent
- mode was specified. */
-#define ODM_E_HANDLE 8 /* The DMHANDLE argument was invalid. */
-#define ODM_E_ACCESS 9 /* User does not have requested access
- rights to specified document. */
-#define ODM_E_INUSE 10 /* Document is currently in use and cannot
- be accessed in specified mode. */
-#define ODM_E_DOCID 11 /* Invalid document ID */
-#define ODM_E_OPENMODE 12 /* The specified action is incompatible
- with the mode in which the document was
- opened. */
-#define ODM_E_NOOPEN 13 /* The specified document is not open. */
-#define ODM_E_ITEM 14 /* Invalid item specifier. */
-#define ODM_E_OTHERAPP 15 /* Selected document was for another app. */
-#define ODM_E_NOMOREDATA 16 /* No more data is available */
-#define ODM_E_PARTIALSUCCESS 17 /* */
-// Additional Error code from ODMA 2.0
-#define ODM_E_REQARG 18 /* */
-#define ODM_E_NOSUPPORT 19 /* */
-#define ODM_E_TRUNCATED 20 /* */
-#define ODM_E_INVARG 21
-#define ODM_E_OFFLINE 22 /* */
-
-
-// ODMOpenDoc modes
-#define ODM_MODIFYMODE 1 /* Open document in a modifiable mode. */
-#define ODM_VIEWMODE 2 /* Open document in non-modifiable mode. */
-// ODMA 2.0
-#define ODM_REFCOPY 3
-
-
-// Actions for ODMActivate
-#define ODM_NONE 0 /* No specific action is requested. */
-#define ODM_DELETE 1 /* Delete the specified document. */
-#define ODM_SHOWATTRIBUTES 2 /* Display the specified document's profile
- or attributes. */
-#define ODM_EDITATTRIBUTES 3 /* Edit the specified document's profile or
- attributes. */
-#define ODM_VIEWDOC 4 /* Display the specified document in a
- viewer window. */
-#define ODM_OPENDOC 5 /* Open the specified document in its
- native application. */
-// ODMA 2.0
-#define ODM_NEWDOC 6
-#define ODM_CHECKOUT 7
-#define ODM_CANCELCHECKOUT 8
-#define ODM_CHECKIN 9
-#define ODM_SHOWHISTORY 10
-
-
-// Item selectors for ODMGetDocInfo and ODMSetDocInfo
-#define ODM_AUTHOR 1 /* Author of the document. */
-#define ODM_NAME 2 /* Descriptive name of the document. */
-#define ODM_TYPE 3 /* Type of the document. */
-#define ODM_TITLETEXT 4 /* Suggested text to display in the
- document window's title bar. */
-#define ODM_DMS_DEFINED 5 /* DMS defined data. */
-#define ODM_CONTENTFORMAT 6 /* String describing document's format */
-// ODMA 2.0
-#define ODM_ALTERNATE_RENDERINGS 7
-#define ODM_CHECKEDOUTBY 8
-#define ODM_CHECKOUTCOMMENT 9
-#define ODM_CHECKOUTDATE 10
-#define ODM_CREATEDBY 11
-#define ODM_CREATEDDATE 12
-#define ODM_DOCID_LATEST 13
-#define ODM_DOCID_RELEASED 14
-#define ODM_DOCVERSION 15
-#define ODM_DOCVERSION_LATEST 16
-#define ODM_DOCVERSION_RELEASED 17
-#define ODM_LOCATION 18
-#define ODM_KEYWORDS 19
-#define ODM_LASTCHECKINBY 20
-#define ODM_LASTCHECKINDATE 21
-#define ODM_MODIFYDATE 22
-#define ODM_MODIFYDATE_LATEST 23
-#define ODM_MODIFYDATE_RELEASED 24
-#define ODM_OWNER 25
-#define ODM_SUBJECT 26
-#define ODM_TITLETEXT_RO 27
-#define ODM_URL 28
-
-
-// Item selectors for ODMQueryCapability ODMA 2.0
-#define ODM_QC_ACTIVATE 1
-#define ODM_QC_CLOSEDOC 2
-#define ODM_QC_CLOSEDOCEX 3
-#define ODM_QC_GETALTERNATECONTENT 4
-#define ODM_QC_GETDMSINFO 5
-#define ODM_QC_GETDOCINFO 6
-#define ODM_QC_GETDOCRELATION 7
-#define ODM_QC_GETLEADMONIKER 8
-#define ODM_QC_NEWDOC 9
-#define ODM_QC_OPENDOC 10
-#define ODM_QC_QUERYCLOSE 11
-#define ODM_QC_QUERYEXECUTE 12
-#define ODM_QC_QUERYGETRESULTS 13
-#define ODM_QC_SAVEAS 14
-#define ODM_QC_SAVEASEX 15
-#define ODM_QC_SAVEDOC 16
-#define ODM_QC_SAVEDOCEX 17
-#define ODM_QC_SELECTDOC 18
-#define ODM_QC_SELECTDOCEX 19
-#define ODM_QC_SETALTERNATECONTENT 20
-#define ODM_QC_SETDOCEVENT 21
-#define ODM_QC_SETDOCRELATION 22
-#define ODM_QC_SETDOCINFO 23
-
-
-// Misc. modes, flags
-#define ODM_SILENT 16 /* Don't interact with the user while
- fulfilling this request. */
-//ODMA 2.0
-#define ODM_VERSION_SAME 1
-#define ODM_VERSION_MAJOR 2
-#define ODM_VERSION_MINOR 4
-#define ODM_VERSION_CHANGED 8
-#define ODM_ALT_DELETE 32
-
-//ODMA 2.0 DMS Info Flags
-#define ODM_EXT_QUERY 1
-#define ODM_EXT_WORKFLOW 2
-
-// Flags for Query Interface
-#define ODM_ALL 1 // All DMS's should be searched
-#define ODM_SPECIFIC 2 // Only specific DMS's should be searched
-
-
-// Function prototypes
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-ODMSTATUS WINAPI ODMRegisterApp(ODMHANDLE FAR *pOdmHandle, WORD version,
- LPSTR lpszAppId, DWORD dwEnvData, LPVOID pReserved);
-
-void WINAPI ODMUnRegisterApp(ODMHANDLE odmHandle);
-
-ODMSTATUS WINAPI ODMSelectDoc(ODMHANDLE odmHandle, LPSTR lpszDocId,
- LPDWORD pdwFlags);
-
-ODMSTATUS WINAPI ODMOpenDoc(ODMHANDLE odmHandle, DWORD flags,
- LPSTR lpszDocId, LPSTR lpszDocLocation);
-
-ODMSTATUS WINAPI ODMSaveDoc(ODMHANDLE odmHandle, LPSTR lpszDocId,
- LPSTR lpszNewDocId);
-
-ODMSTATUS WINAPI ODMCloseDoc(ODMHANDLE odmHandle, LPSTR lpszDocId,
- DWORD activeTime, DWORD pagesPrinted, LPVOID sessionData, WORD dataLen);
-
-ODMSTATUS WINAPI ODMNewDoc(ODMHANDLE odmHandle, LPSTR lpszDocId,
- DWORD dwFlags, LPSTR lpszFormat, LPSTR lpszDocLocation);
-
-ODMSTATUS WINAPI ODMSaveAs(ODMHANDLE odmHandle, LPSTR lpszDocId,
- LPSTR lpszNewDocId, LPSTR lpszFormat, ODMSAVEASCALLBACK pcbCallBack,
- LPVOID pInstanceData);
-
-ODMSTATUS WINAPI ODMActivate(ODMHANDLE odmHandle, WORD action,
- LPSTR lpszDocId);
-
-ODMSTATUS WINAPI ODMGetDocInfo(ODMHANDLE odmHandle, LPSTR lpszDocId,
- WORD item, LPSTR lpszData, WORD dataLen);
-
-ODMSTATUS WINAPI ODMSetDocInfo(ODMHANDLE odmHandle, LPSTR lpszDocId,
- WORD item, LPSTR lpszData);
-
-ODMSTATUS WINAPI ODMGetDMSInfo(ODMHANDLE odmHandle, LPSTR lpszDmsId,
- LPWORD pwVerNo, LPDWORD pdwExtensions);
-
-/* Query Enhancements */
-WORD WINAPI ODMGetDMSCount();
-
-WORD WINAPI ODMGetDMSList( LPSTR buffer, WORD buffer_size );
-
-ODMSTATUS WINAPI ODMGetDMS( LPCSTR lpszAppId, LPSTR lpszDMSId );
-
-ODMSTATUS WINAPI ODMSetDMS( LPCSTR lpszAppId, LPCSTR lpszDMSId );
-
-ODMSTATUS WINAPI ODMQueryExecute(ODMHANDLE odmHandle, LPCSTR lpszQuery,
- DWORD flags, LPCSTR lpszDMSList, LPSTR queryId );
-
-ODMSTATUS WINAPI ODMQueryGetResults(ODMHANDLE odmHandle, LPCSTR queryId,
- LPSTR lpszDocId, LPSTR lpszDocName, WORD docNameLen,
- WORD *docCount );
-
-ODMSTATUS WINAPI ODMQueryClose(ODMHANDLE odmHandle, LPCSTR queryId );
-
-/* ODMA 2.0 Enhancements */
-ODMSTATUS WINAPI ODMCloseDocEx(ODMHANDLE odmHandle, LPSTR lpszDocId,
- LPDWORD pdwFlags, DWORD activeTime, DWORD pagesPrinted,
- LPVOID sessionData, WORD dataLen);
-
-ODMSTATUS WINAPI ODMSaveAsEx(ODMHANDLE odmHandle, LPSTR lpszDocId,
- LPSTR lpszNewDocId, LPSTR lpszFormat, ODMSAVEASCALLBACK pcbCallBack,
- LPVOID pInstanceData, LPDWORD pdwFlags);
-
-ODMSTATUS WINAPI ODMSaveDocEx(ODMHANDLE odmHandle, LPSTR lpszDocId,
- LPSTR lpszNewDocId, LPDWORD pdwFlags);
-
-ODMSTATUS WINAPI ODMSelectDocEx(ODMHANDLE odmHandle, LPSTR lpszDocIds,
- LPWORD pwDocIdsLen, LPWORD pwDocCount, LPDWORD pdwFlags,
- LPSTR lpszFormatFilter);
-
-ODMSTATUS WINAPI ODMQueryCapability(ODMHANDLE odmHandle, LPCSTR lpszDmsId,
- DWORD function, DWORD item, DWORD flags);
-
-ODMSTATUS WINAPI ODMSetDocEvent(ODMHANDLE odmHandle, LPSTR lpszDocId,
- DWORD flags, DWORD event, LPVOID lpData, DWORD dwDataLen,
- LPSTR lpszComment);
-
-ODMSTATUS WINAPI ODMGetAlternateContent(ODMHANDLE odmHandle, LPSTR lpszDocId,
- LPDWORD pdwFlags, LPSTR lpszFormat, LPSTR lpszDocLocation);
-
-ODMSTATUS WINAPI ODMSetAlternateContent(ODMHANDLE odmHandle, LPSTR lpszDocId,
- LPDWORD pdwFlags, LPSTR lpszFormat, LPSTR lpszDocLocation);
-
-ODMSTATUS WINAPI ODMGetDocRelation(ODMHANDLE odmHandle, LPSTR lpszDocId,
- LPDWORD pdwFlags, LPSTR lpszLinkedId, LPSTR lpszFormat,
- LPSTR lpszPreviousId);
-
-ODMSTATUS WINAPI ODMSetDocRelation(ODMHANDLE odmHandle, LPSTR lpszDocId,
- LPDWORD pdwFlags, LPSTR lpszLinkedId, LPSTR lpszFormat,
- LPSTR lpszPreviousId);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
deleted file mode 100644
index 0789bd6..0000000
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ /dev/null
@@ -1,1053 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <osl/diagnose.h>
-#include <com/sun/star/ucb/XDynamicResultSet.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
-#include <com/sun/star/lang/IllegalAccessException.hpp>
-#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
-#include <com/sun/star/ucb/OpenMode.hpp>
-#include <com/sun/star/ucb/XCommandInfo.hpp>
-#include <com/sun/star/ucb/XPersistentPropertySet.hpp>
-#include <ucbhelper/contentidentifier.hxx>
-#include <ucbhelper/propertyvalueset.hxx>
-#include <ucbhelper/cancelcommandexecution.hxx>
-#include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
-#include <com/sun/star/ucb/MissingInputStreamException.hpp>
-#include <com/sun/star/ucb/InsertCommandArgument.hpp>
-#include <com/sun/star/ucb/MissingPropertiesException.hpp>
-#include <com/sun/star/io/XActiveDataStreamer.hpp>
-#include <com/sun/star/ucb/TransferInfo.hpp>
-#include <com/sun/star/ucb/NameClash.hpp>
-#ifdef WNT
-#include <windows.h>
-#endif
-#include "odma_content.hxx"
-#include "odma_contentprops.hxx"
-#include "odma_provider.hxx"
-#include "odma_resultset.hxx"
-#include "odma_inputstream.hxx"
-#include <ucbhelper/content.hxx>
-#include <com/sun/star/uno/Exception.hpp>
-#include <rtl/ref.hxx>
-#include <osl/file.hxx>
-
-using namespace com::sun::star;
-using namespace odma;
-
-//=========================================================================
-//=========================================================================
-//
-// Content Implementation.
-//
-//=========================================================================
-//=========================================================================
-
-Content::Content( const uno::Reference< uno::XComponentContext >& rxContext,
- ContentProvider* pProvider,
- const uno::Reference< ucb::XContentIdentifier >& Identifier,
- const ::rtl::Reference<ContentProperties>& _rProps)
- : ContentImplHelper( rxContext, pProvider, Identifier )
- ,m_aProps(_rProps)
- ,m_pProvider(pProvider)
- ,m_pContent(NULL)
-{
- OSL_ENSURE(m_aProps.is(),"No valid ContentPropeties!");
-}
-
-//=========================================================================
-// virtual
-Content::~Content()
-{
- delete m_pContent;
-}
-
-//=========================================================================
-//
-// XInterface methods.
-//
-//=========================================================================
-
-// virtual
-void SAL_CALL Content::acquire() throw()
-{
- ContentImplHelper::acquire();
-}
-
-//=========================================================================
-// virtual
-void SAL_CALL Content::release() throw()
-{
- ContentImplHelper::release();
-}
-
-//=========================================================================
-// virtual
-uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
- throw ( uno::RuntimeException )
-{
- uno::Any aRet;
-
- // @@@ Add support for additional interfaces.
-
- return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType );
-}
-
-//=========================================================================
-//
-// XTypeProvider methods.
-//
-//=========================================================================
-
-XTYPEPROVIDER_COMMON_IMPL( Content );
-
-//=========================================================================
-// virtual
-uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
- throw( uno::RuntimeException )
-{
- // @@@ Add own interfaces.
-
- static cppu::OTypeCollection* pCollection = 0;
-
- if ( !pCollection )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pCollection )
- {
- static cppu::OTypeCollection aCollection(
- CPPU_TYPE_REF( lang::XTypeProvider ),
- CPPU_TYPE_REF( lang::XServiceInfo ),
- CPPU_TYPE_REF( lang::XComponent ),
- CPPU_TYPE_REF( ucb::XContent ),
- CPPU_TYPE_REF( ucb::XCommandProcessor ),
- CPPU_TYPE_REF( beans::XPropertiesChangeNotifier ),
- CPPU_TYPE_REF( ucb::XCommandInfoChangeNotifier ),
- CPPU_TYPE_REF( beans::XPropertyContainer ),
- CPPU_TYPE_REF( beans::XPropertySetInfoChangeNotifier ),
- CPPU_TYPE_REF( container::XChild ) );
- pCollection = &aCollection;
- }
- }
-
- return (*pCollection).getTypes();
-}
-
-//=========================================================================
-//
-// XServiceInfo methods.
-//
-//=========================================================================
-
-// virtual
-rtl::OUString SAL_CALL Content::getImplementationName()
- throw( uno::RuntimeException )
-{
- // @@@ Adjust implementation name. Keep the prefix "com.sun.star.comp."!
- return rtl::OUString("com.sun.star.comp.odma.Content");
-}
-
-//=========================================================================
-// virtual
-uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
- throw( uno::RuntimeException )
-{
- // @@@ Adjust macro name.
- uno::Sequence< rtl::OUString > aSNS( 1 );
- aSNS.getArray()[ 0 ]
- = rtl::OUString( ODMA_CONTENT_SERVICE_NAME );
- return aSNS;
-}
-
-//=========================================================================
-//
-// XContent methods.
-//
-//=========================================================================
-
-// virtual
-rtl::OUString SAL_CALL Content::getContentType()
- throw( uno::RuntimeException )
-{
- // @@@ Adjust macro name ( def in odma_provider.hxx ).
- return rtl::OUString( ODMA_CONTENT_TYPE );
-}
-
-//=========================================================================
-//
-// XCommandProcessor methods.
-//
-//=========================================================================
-
-// virtual
-uno::Any SAL_CALL Content::execute(
- const ucb::Command& aCommand,
- sal_Int32 /*CommandId*/,
- const uno::Reference< ucb::XCommandEnvironment >& Environment )
- throw( uno::Exception,
- ucb::CommandAbortedException,
- uno::RuntimeException )
-{
- uno::Any aRet;
-
- if ( aCommand.Name == "getPropertyValues" )
- {
- //////////////////////////////////////////////////////////////////
- // getPropertyValues
- //////////////////////////////////////////////////////////////////
-
- uno::Sequence< beans::Property > Properties;
- if ( !( aCommand.Argument >>= Properties ) )
- {
- OSL_FAIL( "Wrong argument type!" );
- ucbhelper::cancelCommandExecution(
- uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString(),
- static_cast< cppu::OWeakObject * >( this ),
- -1 ) ),
- Environment );
- // Unreachable
- }
-
- aRet <<= getPropertyValues( Properties, Environment );
- }
- else if ( aCommand.Name == "setPropertyValues" )
- {
- //////////////////////////////////////////////////////////////////
- // setPropertyValues
- //////////////////////////////////////////////////////////////////
-
- uno::Sequence< beans::PropertyValue > aProperties;
- if ( !( aCommand.Argument >>= aProperties ) )
- {
- OSL_FAIL( "Wrong argument type!" );
- ucbhelper::cancelCommandExecution(
- uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString(),
- static_cast< cppu::OWeakObject * >( this ),
- -1 ) ),
- Environment );
- // Unreachable
- }
-
- if ( !aProperties.getLength() )
- {
- OSL_FAIL( "No properties!" );
- ucbhelper::cancelCommandExecution(
- uno::makeAny( lang::IllegalArgumentException(
- rtl::OUString(),
- static_cast< cppu::OWeakObject * >( this ),
- -1 ) ),
- Environment );
- // Unreachable
- }
-
- aRet <<= setPropertyValues( aProperties, Environment );
- }
- else if ( aCommand.Name == "getPropertySetInfo" )
- {
- //////////////////////////////////////////////////////////////////
- // getPropertySetInfo
- //////////////////////////////////////////////////////////////////
-
- // Note: Implemented by base class.
- aRet <<= getPropertySetInfo( Environment );
- }
- else if ( aCommand.Name == "getCommandInfo" )
- {
- //////////////////////////////////////////////////////////////////
- // getCommandInfo
- //////////////////////////////////////////////////////////////////
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list