[ooo-build-commit] .: 7 commits - bin/g configure.in download.in Makefile.shared patches/dev300
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Aug 26 07:26:59 PDT 2010
Makefile.shared | 22
bin/g | 12
configure.in | 2
download.in | 2
patches/dev300/apply | 79
patches/dev300/desktop-cmd-bulk-conversion.diff | 654 ---
patches/dev300/desktop-infilter-option.diff | 143
patches/dev300/fpicker-common-build.diff | 41
patches/dev300/fpicker-common-scp2.diff | 36
patches/dev300/fpicker-kde-3layer.diff | 33
patches/dev300/fpicker-kde-dialog.diff | 1582 ---------
patches/dev300/fpicker-kde-dont-overwrite.diff | 43
patches/dev300/fpicker-kde-filter-name.diff | 30
patches/dev300/fpicker-kde-less-threads.diff | 100
patches/dev300/fpicker-kde-local-media.diff | 48
patches/dev300/fpicker-kde-local-media2.diff | 75
patches/dev300/fpicker-kde-modal.diff | 121
patches/dev300/fpicker-kde-non-utf8.diff | 104
patches/dev300/fpicker-kde-partial-kio.diff | 201 -
patches/dev300/fpicker-kde-resmgr.diff | 87
patches/dev300/fpicker-kde-service.diff | 2503 --------------
patches/dev300/fpicker-kde-too-wide.diff | 32
patches/dev300/linkwarn-dlg-in-apps.diff | 111
patches/dev300/linkwarn-officecfg-disable-msgbox.diff | 27
patches/dev300/linkwarn-sd-no-dnd-links.diff | 24
patches/dev300/linkwarn-sfx2-disable-cb-persistency.diff | 38
patches/dev300/linkwarn-svtools-miscopts-bits.diff | 150
patches/dev300/linkwarn-svx-warning-dlg.diff | 470 --
patches/dev300/novell-win32-odma.diff | 2632 ---------------
patches/dev300/ui-desktop-integration.diff | 250 -
30 files changed, 41 insertions(+), 9611 deletions(-)
New commits:
commit a61989d47ff6f214cfaf4b42bf9f7683a0753d57
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Aug 26 08:57:49 2010 +0200
Update the build directory when the repos changed.
When there were patches moved to the repos, we need to make sure that we are
still able to apply patches; so we need to unapply all the patches, rsync
changes from rawbuild/ to build/oooABC-mX, and apply the patches again.
Unfortunately, it can take a while, but works well.
diff --git a/Makefile.shared b/Makefile.shared
index 84ebd2b..234c2d6 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -36,7 +36,7 @@ $(STAMP_DIR)/autocorr.apply: $(OOBUILDDIR)/unpack \
$(top_srcdir)/bin/add_acor.py $(OOBUILDDIR) $(top_srcdir)/src/acor.csv
touch $@
-patch.apply: $(OOBUILDDIR)/unpack $(STAMP_DIR)/patch.apply
+patch.apply: $(OOBUILDDIR)/unpack $(STAMP_DIR)/refresh $(STAMP_DIR)/patch.apply
$(STAMP_DIR)/patch.apply : $(top_srcdir)/patches/apply.pl \
$(top_srcdir)/patches/*/*.diff \
$(APPLY_DIR)/apply
@@ -74,6 +74,22 @@ patch.list:
CURRTAG=$(CVSTAG); test -f $(OOBUILDDIR)/.tag && CURRTAG=`cat $(OOBUILDDIR)/.tag`; \
chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS --dry-run --quiet --tag=$$CURRTAG
+$(STAMP_DIR)/refresh : $(CLONEDIR)/repos_changed
+ echo blah
+ echo $(OOO_GIT)
+ if test "z$(OOO_GIT)" != "z" ; then \
+ $(TOOLSDIR)/bin/transform --revert $(TOOLSDIR) $(OOBUILDDIR) ; \
+ FLAGS=`$(TOOLSDIR)/bin/applyflags $(TOOLSDIR)/bin` ; \
+ chmod +x $(TOOLSDIR)/patches/apply.pl && $(TOOLSDIR)/patches/apply.pl $(APPLY_DIR) $(OOBUILDDIR) $$FLAGS -R ; \
+ echo "Rsyncing changes from the repos to the build tree - [ go and have some $(DRINK) ] ..." ; \
+ rsync -prL --exclude .git --exclude 'unxlng??.pro' --exclude '/solver' --exclude '/install' "$(RAWBUILDDIR)/" "$(OOBUILDDIR)/" ; \
+ rm -f $(STAMP_DIR)/patch.apply ; \
+ fi
+ touch $@
+
+$(CLONEDIR)/repos_changed :
+ if test ! -e $@ ; then touch $@ ; fi
+
# Build bits:
prebuild : $(STAMP_DIR)/prebuild
@@ -98,12 +114,14 @@ $(STAMP_DIR)/build.tools : $(STAMP_DIR)/prebuild
build.prepare : $(STAMP_DIR)/build_prepared
$(STAMP_DIR)/build_prepared : $(OOBUILDDIR)/unpack \
+ $(STAMP_DIR)/refresh \
$(STAMP_DIR)/patch.apply \
$(STAMP_DIR)/artwork.install \
- $(STAMP_DIR)/autocorr.apply \
+ $(STAMP_DIR)/autocorr.apply \
$(STAMP_DIR)/build.tools \
$(STAMP_DIR)/prebuild
touch $@
+
build : $(STAMP_DIR)/build
$(STAMP_DIR)/build : $(STAMP_DIR)/build_prepared
cd $(top_srcdir)/bin ; ./build-ooo
diff --git a/bin/g b/bin/g
index bdf8cf5..2c648fd 100755
--- a/bin/g
+++ b/bin/g
@@ -136,9 +136,17 @@ for DIR in * ; do
esac
[ "$COMMAND" != 'diff' ] && echo "===== $DIR ====="
+
+ # check for changes
+ HEADREF=`git show-ref --head HEAD`
+
git $PAGER "$COMMAND" $EXTRA "${FILES[@]}"
RETURN=$?
+ # update stamp if the repo changed
+ NEWHEADREF=`git show-ref --head HEAD`
+ [ "$HEADREF" != "$NEWHEADREF" ] && touch $CLONEDIR/repos_changed
+
# git status returns error in some versions; we want to continue
[ "$COMMAND" = "status" ] && RETURN=0
diff --git a/configure.in b/configure.in
index 08fd1cb..759e14b 100644
--- a/configure.in
+++ b/configure.in
@@ -1583,7 +1583,7 @@ else
if test "$with_git" != "yes" ; then
OOO_GIT="$with_git"
else
- guess=`git remote show origin | grep 'Fetch URL: ' | sed -e 's/^.*Fetch URL: //' -e 's#/ooo-build$##'`
+ guess=`git remote show -n origin | grep 'Fetch URL: ' | sed -e 's/^.*Fetch URL: //' -e 's#/ooo-build$##'`
if test -n "$guess" ; then
OOO_GIT="$guess"
fi
diff --git a/download.in b/download.in
index 65266bd..cadcd50 100755
--- a/download.in
+++ b/download.in
@@ -331,7 +331,7 @@ sub download_files($$$)
if (!-d "@SRCDIR@") {
`mkdir -p @SRCDIR@`;
}
-if ( '@OOO_GIT@' ne "" && !-d "@CLONEDIR@" ) {
+if ( !-d "@CLONEDIR@" ) {
`mkdir -p @CLONEDIR@`;
}
commit 709fb78f8f58320878bd7d060b508f0f85f1242a
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 25 23:40:00 2010 +0200
Moved the batch conversion patches to the repos.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 499c29a..9d5155c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2978,9 +2978,6 @@ ooxml-sc-page-date.diff, muthusuba
ooxml-schema.diff, muthusuba
ooxml-sc-paneexport.diff, muthusuba
ooxml-sc-showdropdown-fix.diff, muthusuba
-desktop-cmd-bulk-conversion.diff, flr-muthusuba
-# depends on (order) desktop-cmd-bulk-conversion.diff
-desktop-infilter-option.diff, muthusuba
[ OOXMLExportDevel <= ooo330-m2 ]
ooxml-sc-docpropsimp-m2.diff, muthusuba
diff --git a/patches/dev300/desktop-cmd-bulk-conversion.diff b/patches/dev300/desktop-cmd-bulk-conversion.diff
deleted file mode 100644
index ecacb7c..0000000
--- a/patches/dev300/desktop-cmd-bulk-conversion.diff
+++ /dev/null
@@ -1,654 +0,0 @@
-Muthu's / Flr's batch conversion cmd line work
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- desktop/source/app/app.cxx | 9 +
- desktop/source/app/cmdlineargs.cxx | 67 +++++++++++
- desktop/source/app/cmdlineargs.hxx | 6 +
- desktop/source/app/cmdlinehelp.cxx | 12 ++
- desktop/source/app/dispatchwatcher.cxx | 203 +++++++++++++++++++++++++++++---
- desktop/source/app/dispatchwatcher.hxx | 6 +
- desktop/source/app/officeipcthread.cxx | 59 +++++++++
- desktop/source/app/officeipcthread.hxx | 3
- sfx2/source/bastyp/fltfnc.cxx | 10 +-
- 9 files changed, 346 insertions(+), 29 deletions(-)
-
-
-diff --git desktop/source/app/app.cxx desktop/source/app/app.cxx
-index 367436f..76b715d 100644
---- desktop/source/app/app.cxx
-+++ desktop/source/app/app.cxx
-@@ -2543,6 +2543,9 @@ void Desktop::OpenClients()
- pArgs->GetPrinterName( aRequest.aPrinterName );
- pArgs->GetForceOpenList( aRequest.aForceOpenList );
- pArgs->GetForceNewList( aRequest.aForceNewList );
-+ pArgs->GetConversionList( aRequest.aConversionList );
-+ pArgs->GetConversionParams( aRequest.aConversionParams );
-+ pArgs->GetConversionOut( aRequest.aConversionOut );
-
- if ( aRequest.aOpenList.getLength() > 0 ||
- aRequest.aViewList.getLength() > 0 ||
-@@ -2550,7 +2553,8 @@ void Desktop::OpenClients()
- aRequest.aPrintList.getLength() > 0 ||
- aRequest.aForceOpenList.getLength() > 0 ||
- aRequest.aForceNewList.getLength() > 0 ||
-- ( aRequest.aPrintToList.getLength() > 0 && aRequest.aPrinterName.getLength() > 0 ))
-+ ( aRequest.aPrintToList.getLength() > 0 && aRequest.aPrinterName.getLength() > 0 ) ||
-+ aRequest.aConversionList.getLength() > 0 )
- {
- bLoaded = sal_True;
-
-@@ -2900,7 +2904,8 @@ void Desktop::OpenSplashScreen()
- !pCmdLine->IsNoLogo() &&
- !pCmdLine->IsTerminateAfterInit() &&
- !pCmdLine->GetPrintList( aTmpString ) &&
-- !pCmdLine->GetPrintToList( aTmpString ) )
-+ !pCmdLine->GetPrintToList( aTmpString ) &&
-+ !pCmdLine->GetConversionList( aTmpString ))
- {
- // Determine application name from command line parameters
- OUString aAppName;
-diff --git desktop/source/app/cmdlineargs.cxx desktop/source/app/cmdlineargs.cxx
-index d3622f5..49734b2 100644
---- desktop/source/app/cmdlineargs.cxx
-+++ desktop/source/app/cmdlineargs.cxx
-@@ -151,6 +151,11 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
- sal_Bool bForceOpenEvent = sal_False;
- sal_Bool bForceNewEvent = sal_False;
- sal_Bool bDisplaySpec = sal_False;
-+ sal_Bool bConversionEvent= sal_False;
-+ sal_Bool bConversionParamsEvent= sal_False;
-+ sal_Bool bBatchPrintEvent= sal_False;
-+ sal_Bool bBatchPrinterNameEvent= sal_False;
-+ sal_Bool bConversionOutEvent = sal_False;
-
- m_eArgumentCount = NONE;
-
-@@ -295,6 +300,27 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
- bDisplaySpec = sal_False;
- }
- #endif
-+ else if ( aArgStr.EqualsIgnoreCaseAscii( "-convert-to" ) )
-+ {
-+ bOpenEvent = sal_False;
-+ bConversionEvent = sal_True;
-+ bConversionParamsEvent = sal_True;
-+ }
-+ else if ( aArgStr.EqualsIgnoreCaseAscii( "-print-to-file" ) )
-+ {
-+ bOpenEvent = sal_False;
-+ bBatchPrintEvent = sal_True;
-+ }
-+ else if ( aArgStr.EqualsIgnoreCaseAscii( "-printer-name" ) &&
-+ bBatchPrintEvent )
-+ {
-+ bBatchPrinterNameEvent = sal_True;
-+ }
-+ else if ( aArgStr.EqualsIgnoreCaseAscii( "-outdir" ) &&
-+ (bConversionEvent || bBatchPrintEvent) )
-+ {
-+ bConversionOutEvent = sal_True;
-+ }
- }
- else
- {
-@@ -304,6 +330,23 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
- AddStringListParam_Impl( CMD_STRINGPARAM_PRINTERNAME, aArgStr );
- bPrinterName = sal_False;
- }
-+ else if ( bConversionParamsEvent && bConversionEvent )
-+ {
-+ // first argument must be the the params
-+ AddStringListParam_Impl( CMD_STRINGPARAM_CONVERSIONPARAMS, aArgStr );
-+ bConversionParamsEvent = sal_False;
-+ }
-+ else if ( bBatchPrinterNameEvent && bBatchPrintEvent )
-+ {
-+ // first argument is the printer name
-+ AddStringListParam_Impl( CMD_STRINGPARAM_PRINTERNAME, aArgStr );
-+ bBatchPrinterNameEvent = sal_False;
-+ }
-+ else if ( (bConversionEvent || bBatchPrintEvent) && bConversionOutEvent )
-+ {
-+ AddStringListParam_Impl( CMD_STRINGPARAM_CONVERSIONOUT, aArgStr );
-+ bConversionOutEvent = sal_False;
-+ }
- else
- {
- if( bOpenEvent || bViewEvent || bForceNewEvent || bForceOpenEvent )
-@@ -335,6 +378,8 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
- bDisplaySpec = sal_False; // only one display, not a lsit
- bOpenEvent = sal_True; // set back to standard
- }
-+ else if ( bConversionEvent || bBatchPrintEvent )
-+ AddStringListParam_Impl( CMD_STRINGPARAM_CONVERSIONLIST, aArgStr );
- }
- }
- }
-@@ -904,6 +949,28 @@ sal_Bool CommandLineArgs::GetLanguage( ::rtl::OUString& rPara ) const
- return m_aStrSetParams[ CMD_STRINGPARAM_LANGUAGE ];
- }
-
-+sal_Bool CommandLineArgs::GetConversionList( ::rtl::OUString& rPara ) const
-+{
-+ osl::MutexGuard aMutexGuard( m_aMutex );
-+ rPara = m_aStrParams[ CMD_STRINGPARAM_CONVERSIONLIST ];
-+ return m_aStrSetParams[ CMD_STRINGPARAM_CONVERSIONLIST ];
-+}
-+
-+sal_Bool CommandLineArgs::GetConversionParams( ::rtl::OUString& rPara ) const
-+{
-+ osl::MutexGuard aMutexGuard( m_aMutex );
-+ rPara = m_aStrParams[ CMD_STRINGPARAM_CONVERSIONPARAMS ];
-+ return m_aStrSetParams[ CMD_STRINGPARAM_CONVERSIONPARAMS ];
-+}
-+sal_Bool CommandLineArgs::GetConversionOut( ::rtl::OUString& rPara ) const
-+{
-+ osl::MutexGuard aMutexGuard( m_aMutex );
-+ rPara = m_aStrParams[ CMD_STRINGPARAM_CONVERSIONOUT ];
-+ return m_aStrSetParams[ CMD_STRINGPARAM_CONVERSIONOUT ];
-+}
-+
-+
-+
- sal_Bool CommandLineArgs::IsEmpty() const
- {
- osl::MutexGuard aMutexGuard( m_aMutex );
-diff --git desktop/source/app/cmdlineargs.hxx desktop/source/app/cmdlineargs.hxx
-index d1db805..0efd32b 100644
---- desktop/source/app/cmdlineargs.hxx
-+++ desktop/source/app/cmdlineargs.hxx
-@@ -91,6 +91,9 @@ class CommandLineArgs
- CMD_STRINGPARAM_VERSION,
- CMD_STRINGPARAM_PRINTTOLIST,
- CMD_STRINGPARAM_PRINTERNAME,
-+ CMD_STRINGPARAM_CONVERSIONLIST,
-+ CMD_STRINGPARAM_CONVERSIONPARAMS,
-+ CMD_STRINGPARAM_CONVERSIONOUT,
- CMD_STRINGPARAM_DISPLAY,
- CMD_STRINGPARAM_LANGUAGE,
- CMD_STRINGPARAM_COUNT // must be last element!
-@@ -172,6 +175,9 @@ class CommandLineArgs
- sal_Bool GetPrintToList( ::rtl::OUString& rPara ) const;
- sal_Bool GetPrinterName( ::rtl::OUString& rPara ) const;
- sal_Bool GetLanguage( ::rtl::OUString& rPara ) const;
-+ sal_Bool GetConversionList( ::rtl::OUString& rPara ) const;
-+ sal_Bool GetConversionParams( ::rtl::OUString& rPara ) const;
-+ sal_Bool GetConversionOut( ::rtl::OUString& rPara ) const;
-
- // Special analyzed states (does not match directly to a command line parameter!)
- sal_Bool IsPrinting() const;
-diff --git desktop/source/app/cmdlinehelp.cxx desktop/source/app/cmdlinehelp.cxx
-index 3032315..e4518c1 100644
---- desktop/source/app/cmdlinehelp.cxx
-+++ desktop/source/app/cmdlinehelp.cxx
-@@ -116,7 +116,17 @@ namespace desktop
- "-unaccept=<accept-string>\n"\
- " Close an acceptor that was created with -accept=<accept-string>\n"\
- " Use -unnaccept=all to close all open acceptors\n"\
-- "Remaining arguments will be treated as filenames or URLs of documents to open.\n";
-+ "-convert-to output_file_extension[:output_filter_name] [-outdir ouput_dir] files\n"\
-+ " Batch convert files.\n"\
-+ " If -outdir is not specified then current working dir is used as output_dir.\n"\
-+ " Eg. -convert-to pdf *.doc\n"\
-+ " -convert-to pdf:writer_pdf_Export -outdir /home/user *.doc\n"\
-+ "-print-to-file [-printer-name printer_name] [-outdir ouput_dir] files\n"\
-+ " Batch print files to file.\n"\
-+ " If -outdir is not specified then current working dir is used as output_dir.\n"\
-+ " Eg. -print-to-file *.doc\n"\
-+ " -print-to-file -printer-name nasty_lowres_printer -outdir /home/user *.doc\n"\
-+ "\nRemaining arguments will be treated as filenames or URLs of documents to open.\n";
-
- void ReplaceStringHookProc( UniString& rStr );
-
-diff --git desktop/source/app/dispatchwatcher.cxx desktop/source/app/dispatchwatcher.cxx
-index e6383e3..83008fb 100644
---- desktop/source/app/dispatchwatcher.cxx
-+++ desktop/source/app/dispatchwatcher.cxx
-@@ -28,6 +28,12 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_desktop.hxx"
-
-+#include <sfx2/docfile.hxx>
-+#include <sfx2/docfilt.hxx>
-+#include <sfx2/fcontnr.hxx>
-+#include "osl/file.hxx"
-+#include <svl/fstathelper.hxx>
-+
- #include "dispatchwatcher.hxx"
- #include <rtl/ustring.hxx>
- #include <tools/string.hxx>
-@@ -48,13 +54,15 @@
- #include <com/sun/star/util/XURLTransformer.hpp>
- #include <com/sun/star/document/MacroExecMode.hpp>
- #include <com/sun/star/document/UpdateDocMode.hpp>
-+#include <com/sun/star/frame/XStorable.hpp>
-
- #include <tools/urlobj.hxx>
- #include <comphelper/mediadescriptor.hxx>
-
- #include <vector>
-+#include <osl/thread.hxx>
-
--using namespace ::rtl;
-+using ::rtl::OUString;
- using namespace ::osl;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::util;
-@@ -80,6 +88,42 @@ struct DispatchHolder
- Reference< XDispatch > xDispatch;
- };
-
-+// Temporary code
-+static void impl_sleep( sal_uInt32 nSec )
-+{
-+ TimeValue aTime;
-+ aTime.Seconds = nSec;
-+ aTime.Nanosec = 0;
-+
-+ osl::Thread::wait( aTime );
-+}
-+
-+static String impl_GetFilterFromExt( OUString aUrl, SfxFilterFlags nFlags,
-+ String aAppl )
-+{
-+ String aFilter;
-+ SfxMedium* pMedium = new SfxMedium( aUrl,
-+ STREAM_STD_READ, FALSE );
-+ const SfxFilter *pSfxFilter = NULL;
-+ SfxFilterMatcher aMatcher;
-+ if( nFlags == SFX_FILTER_EXPORT )
-+ aMatcher = SfxFilterMatcher( aAppl );
-+ aMatcher.GuessFilterIgnoringContent( *pMedium, &pSfxFilter, nFlags, 0 );
-+ if( pSfxFilter )
-+ aFilter = ( nFlags == SFX_FILTER_EXPORT ) ? pSfxFilter->GetFilterName() :
-+ pSfxFilter->GetServiceName();
-+
-+ delete pMedium;
-+ return aFilter;
-+}
-+static OUString impl_GuessFilter( OUString aUrlIn, OUString aUrlOut )
-+{
-+ /* aAppl can also be set to Factory like scalc, swriter... */
-+ String aAppl;
-+ aAppl = impl_GetFilterFromExt( aUrlIn, SFX_FILTER_IMPORT, aAppl );
-+ return impl_GetFilterFromExt( aUrlOut, SFX_FILTER_EXPORT, aAppl );
-+}
-+
- Mutex* DispatchWatcher::pWatcherMutex = NULL;
-
- Mutex& DispatchWatcher::GetMutex()
-@@ -141,7 +185,6 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
-
- for ( p = aDispatchRequestsList.begin(); p != aDispatchRequestsList.end(); p++ )
- {
-- String aPrinterName;
- const DispatchRequest& aDispatchRequest = *p;
-
- // create parameter array
-@@ -151,7 +194,9 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
-
- // we need more properties for a print/print to request
- if ( aDispatchRequest.aRequestType == REQUEST_PRINT ||
-- aDispatchRequest.aRequestType == REQUEST_PRINTTO )
-+ aDispatchRequest.aRequestType == REQUEST_PRINTTO ||
-+ aDispatchRequest.aRequestType == REQUEST_BATCHPRINT ||
-+ aDispatchRequest.aRequestType == REQUEST_CONVERSION)
- nCount++;
-
- Sequence < PropertyValue > aArgs( nCount );
-@@ -161,7 +206,9 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
- aArgs[0].Value <<= ::rtl::OUString::createFromAscii("private:OpenEvent");
-
- if ( aDispatchRequest.aRequestType == REQUEST_PRINT ||
-- aDispatchRequest.aRequestType == REQUEST_PRINTTO )
-+ aDispatchRequest.aRequestType == REQUEST_PRINTTO ||
-+ aDispatchRequest.aRequestType == REQUEST_BATCHPRINT ||
-+ aDispatchRequest.aRequestType == REQUEST_CONVERSION)
- {
- aArgs[1].Name = ::rtl::OUString::createFromAscii("ReadOnly");
- aArgs[2].Name = ::rtl::OUString::createFromAscii("OpenNewView");
-@@ -196,7 +243,9 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
- ::rtl::OUString aTarget( RTL_CONSTASCII_USTRINGPARAM("_default") );
-
- if ( aDispatchRequest.aRequestType == REQUEST_PRINT ||
-- aDispatchRequest.aRequestType == REQUEST_PRINTTO )
-+ aDispatchRequest.aRequestType == REQUEST_PRINTTO ||
-+ aDispatchRequest.aRequestType == REQUEST_BATCHPRINT ||
-+ aDispatchRequest.aRequestType == REQUEST_CONVERSION)
- {
- // documents opened for printing are opened readonly because they must be opened as a new document and this
- // document could be open already
-@@ -214,7 +263,6 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
- // hidden documents should never be put into open tasks
- aTarget = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") );
- }
--
- // load the document ... if they are loadable!
- // Otherwise try to dispatch it ...
- Reference < XPrintable > xDoc;
-@@ -361,24 +409,133 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
- OfficeIPCThread::RequestsCompleted( 1 );
- }
- else if ( aDispatchRequest.aRequestType == REQUEST_PRINT ||
-- aDispatchRequest.aRequestType == REQUEST_PRINTTO )
-+ aDispatchRequest.aRequestType == REQUEST_PRINTTO ||
-+ aDispatchRequest.aRequestType == REQUEST_BATCHPRINT ||
-+ aDispatchRequest.aRequestType == REQUEST_CONVERSION )
- {
- if ( xDoc.is() )
- {
-- if ( aDispatchRequest.aRequestType == REQUEST_PRINTTO )
-- {
-- // create the printer
-+ if ( aDispatchRequest.aRequestType == REQUEST_CONVERSION ) {
-+ Reference< XStorable > xStorable( xDoc, UNO_QUERY );
-+ if ( xStorable.is() ) {
-+ rtl::OUString aParam = aDispatchRequest.aPrinterName;
-+ sal_Int32 nPathIndex = aParam.lastIndexOfAsciiL( ";", 1 );
-+ sal_Int32 nFilterIndex = aParam.indexOfAsciiL( ":", 1 );
-+ if( nPathIndex < nFilterIndex )
-+ nFilterIndex = -1;
-+ rtl::OUString aFilterOut=aParam.copy( nPathIndex+1 );
-+ rtl::OUString aFilter;
-+ rtl::OUString aFilterExt;
-+ sal_Bool bGuess = sal_False;
-+
-+ if( nFilterIndex >= 0 )
-+ {
-+ aFilter = aParam.copy( nFilterIndex+1, nPathIndex-nFilterIndex-1 );
-+ aFilterExt = aParam.copy( 0, nFilterIndex );
-+ }
-+ else
-+ {
-+ // Guess
-+ bGuess = sal_True;
-+ aFilterExt = aParam.copy( 0, nPathIndex );
-+ }
-+ INetURLObject aOutFilename( aObj );
-+ aOutFilename.SetExtension( aFilterExt );
-+ FileBase::getFileURLFromSystemPath( aFilterOut, aFilterOut );
-+ rtl::OUString aOutFile = aFilterOut+
-+ ::rtl::OUString::createFromAscii( "/" )+
-+ aOutFilename.getName();
-+ //FileBase::getFileURLFromSystemPath( aOutFile, aOutFile );
-+
-+ if ( bGuess )
-+ {
-+ aFilter = impl_GuessFilter( aName, aOutFile );
-+ }
-+
-+ Sequence<PropertyValue> conversionProperties( 2 );
-+ conversionProperties[0].Name = ::rtl::OUString::createFromAscii( "Overwrite" );
-+ conversionProperties[0].Value <<= sal_True;
-+
-+ conversionProperties[1].Name = ::rtl::OUString::createFromAscii( "FilterName" );
-+ conversionProperties[1].Value <<= aFilter;
-+
-+ rtl::OUString aTempName;
-+ FileBase::getSystemPathFromFileURL( aName, aTempName );
-+ rtl::OString aSource8 = ::rtl::OUStringToOString ( aTempName, RTL_TEXTENCODING_UTF8 );
-+ FileBase::getSystemPathFromFileURL( aOutFile, aTempName );
-+ rtl::OString aTargetURL8 = ::rtl::OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8 );
-+ printf("convert %s -> %s using %s\n", aSource8.getStr(), aTargetURL8.getStr(),
-+ ::rtl::OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr());
-+ if( FStatHelper::IsDocument(aOutFile) )
-+ printf("Overwriting: %s\n",::rtl::OUStringToOString( aTempName, RTL_TEXTENCODING_UTF8 ).getStr() );
-+ try
-+ {
-+ xStorable->storeToURL( aOutFile, conversionProperties );
-+ }
-+ catch ( Exception& )
-+ {
-+ fprintf( stderr, "Error: Please reverify input parameters...\n" );
-+ }
-+ }
-+ } else if ( aDispatchRequest.aRequestType == REQUEST_BATCHPRINT ) {
-+ rtl::OUString aParam = aDispatchRequest.aPrinterName;
-+ sal_Int32 nPathIndex = aParam.lastIndexOfAsciiL( ";", 1 );
-+
-+ rtl::OUString aFilterOut;
-+ rtl::OUString aPrinterName;
-+ if( nPathIndex != -1 )
-+ aFilterOut=aParam.copy( nPathIndex+1 );
-+ if( nPathIndex != 0 )
-+ aPrinterName=aParam.copy( 0, nPathIndex );
-+
-+ INetURLObject aOutFilename( aObj );
-+ aOutFilename.SetExtension( ::rtl::OUString::createFromAscii("ps") );
-+ FileBase::getFileURLFromSystemPath( aFilterOut, aFilterOut );
-+ rtl::OUString aOutFile = aFilterOut+
-+ ::rtl::OUString::createFromAscii( "/" )+
-+ aOutFilename.getName();
-+
-+ rtl::OUString aTempName;
-+ FileBase::getSystemPathFromFileURL( aName, aTempName );
-+ rtl::OString aSource8 = ::rtl::OUStringToOString ( aTempName, RTL_TEXTENCODING_UTF8 );
-+ FileBase::getSystemPathFromFileURL( aOutFile, aTempName );
-+ rtl::OString aTargetURL8 = ::rtl::OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8 );
-+ printf("print %s -> %s using %s\n", aSource8.getStr(), aTargetURL8.getStr(),
-+ aPrinterName.getLength() ?
-+ ::rtl::OUStringToOString( aPrinterName, RTL_TEXTENCODING_UTF8 ).getStr() : "<default_printer>");
-+
-+ // create the custom printer, if given
- Sequence < PropertyValue > aPrinterArgs( 1 );
-- aPrinterArgs[0].Name = ::rtl::OUString::createFromAscii("Name");
-- aPrinterArgs[0].Value <<= ::rtl::OUString( aDispatchRequest.aPrinterName );
-- xDoc->setPrinter( aPrinterArgs );
-+ if( aPrinterName.getLength() )
-+ {
-+ aPrinterArgs[0].Name = ::rtl::OUString::createFromAscii("Name");
-+ aPrinterArgs[0].Value <<= aPrinterName;
-+ xDoc->setPrinter( aPrinterArgs );
-+ }
-+
-+ // print ( also without user interaction )
-+ aPrinterArgs.realloc(2);
-+ aPrinterArgs[0].Name = ::rtl::OUString::createFromAscii("FileName");
-+ aPrinterArgs[0].Value <<= aOutFile;
-+ aPrinterArgs[1].Name = ::rtl::OUString::createFromAscii("Wait");
-+ aPrinterArgs[1].Value <<= ( sal_Bool ) sal_True;
-+ xDoc->print( aPrinterArgs );
-+ } else {
-+ if ( aDispatchRequest.aRequestType == REQUEST_PRINTTO )
-+ {
-+ // create the printer
-+ Sequence < PropertyValue > aPrinterArgs( 1 );
-+ aPrinterArgs[0].Name = ::rtl::OUString::createFromAscii("Name");
-+ aPrinterArgs[0].Value <<= ::rtl::OUString( aDispatchRequest.aPrinterName );
-+ xDoc->setPrinter( aPrinterArgs );
-+ }
-+
-+ // print ( also without user interaction )
-+ Sequence < PropertyValue > aPrinterArgs( 1 );
-+ aPrinterArgs[0].Name = ::rtl::OUString::createFromAscii("Wait");
-+ aPrinterArgs[0].Value <<= ( sal_Bool ) sal_True;
-+ xDoc->print( aPrinterArgs );
- }
--
-- // print ( also without user interaction )
-- Sequence < PropertyValue > aPrinterArgs( 1 );
-- aPrinterArgs[0].Name = ::rtl::OUString::createFromAscii("Wait");
-- aPrinterArgs[0].Value <<= ( sal_Bool ) sal_True;
-- xDoc->print( aPrinterArgs );
- }
- else
- {
-@@ -442,9 +599,15 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
- // implementation via statusChanged!!
- if ( bEmpty && !bNoTerminate /*m_aRequestContainer.empty()*/ )
- {
-+ // Delay give a chance for threads to complete work
-+ impl_sleep(2);
-+
- // We have to check if we have an open task otherwise we have to shutdown the office.
- Reference< XFramesSupplier > xTasksSupplier( xDesktop, UNO_QUERY );
- aGuard.clear();
-+
-+ // Delay give a chance for threads to complete work
-+ impl_sleep(1);
-
- Reference< XElementAccess > xList( xTasksSupplier->getFrames(), UNO_QUERY );
-
-@@ -470,7 +633,7 @@ throw(::com::sun::star::uno::RuntimeException)
- void SAL_CALL DispatchWatcher::dispatchFinished( const DispatchResultEvent& ) throw( RuntimeException )
- {
- osl::ClearableMutexGuard aGuard( GetMutex() );
-- sal_Int16 nCount = --m_nRequestCount;
-+ sal_Int16 nCount = m_nRequestCount;
- aGuard.clear();
- OfficeIPCThread::RequestsCompleted( 1 );
- /*
-diff --git desktop/source/app/dispatchwatcher.hxx desktop/source/app/dispatchwatcher.hxx
-index f7de7ae..62828a5 100644
---- desktop/source/app/dispatchwatcher.hxx
-+++ desktop/source/app/dispatchwatcher.hxx
-@@ -75,7 +75,9 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame:
- REQUEST_PRINT,
- REQUEST_PRINTTO,
- REQUEST_FORCEOPEN,
-- REQUEST_FORCENEW
-+ REQUEST_FORCENEW,
-+ REQUEST_CONVERSION,
-+ REQUEST_BATCHPRINT
- };
-
- struct DispatchRequest
-@@ -86,7 +88,7 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame:
- RequestType aRequestType;
- rtl::OUString aURL;
- boost::optional< rtl::OUString > aCwdUrl;
-- rtl::OUString aPrinterName;
-+ rtl::OUString aPrinterName; // also conversion params
- rtl::OUString aPreselectedFactory;
- };
-
-diff --git desktop/source/app/officeipcthread.cxx desktop/source/app/officeipcthread.cxx
-index 0bd9db4..569a0d7 100644
---- desktop/source/app/officeipcthread.cxx
-+++ desktop/source/app/officeipcthread.cxx
-@@ -51,6 +51,7 @@
- #include "osl/file.hxx"
- #include "rtl/process.h"
- #include "tools/getprocessworkingdir.hxx"
-+#include "osl/file.hxx"
-
- using namespace vos;
- using namespace rtl;
-@@ -945,6 +946,62 @@ static void AddToDispatchList(
- }
- }
-
-+static void AddConversionsToDispatchList(
-+ DispatchWatcher::DispatchList& rDispatchList,
-+ boost::optional< rtl::OUString > const & cwdUrl,
-+ const OUString& rRequestList,
-+ const OUString& rParam,
-+ const OUString& rPrinterName,
-+ const OUString& rFactory,
-+ const OUString& rParamOut )
-+{
-+ DispatchWatcher::RequestType nType;
-+ OUString aParam( rParam );
-+
-+ if( rParam.getLength() )
-+ {
-+ nType = DispatchWatcher::REQUEST_CONVERSION;
-+ aParam = rParam;
-+ }
-+ else
-+ {
-+ nType = DispatchWatcher::REQUEST_BATCHPRINT;
-+ aParam = rPrinterName;
-+ }
-+
-+ OUString aOutDir( rParamOut.trim() );
-+ ::rtl::OUString aPWD;
-+ ::tools::getProcessWorkingDir( &aPWD );
-+
-+ if( !::osl::FileBase::getAbsoluteFileURL( aPWD, rParamOut, aOutDir ) )
-+ ::osl::FileBase::getSystemPathFromFileURL( aOutDir, aOutDir );
-+
-+ if( rParamOut.trim().getLength() )
-+ {
-+ aParam += ::rtl::OUString::createFromAscii(";");
-+ aParam += aOutDir;
-+ }
-+ else
-+ {
-+ ::osl::FileBase::getSystemPathFromFileURL( aPWD, aPWD );
-+ aParam += ::rtl::OUString::createFromAscii( ";" ) + aPWD;
-+ }
-+
-+ if ( rRequestList.getLength() > 0 )
-+ {
-+ sal_Int32 nIndex = 0;
-+ do
-+ {
-+ OUString aToken = rRequestList.getToken( 0, APPEVENT_PARAM_DELIMITER, nIndex );
-+ if ( aToken.getLength() > 0 )
-+ rDispatchList.push_back(
-+ DispatchWatcher::DispatchRequest( nType, aToken, cwdUrl, aParam, rFactory ));
-+ }
-+ while ( nIndex >= 0 );
-+ }
-+}
-+
-+
- sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequest )
- {
- // protect the dispatch list
-@@ -961,7 +1018,7 @@ sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequ
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aPrintToList, DispatchWatcher::REQUEST_PRINTTO, aRequest.aPrinterName, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aForceOpenList, DispatchWatcher::REQUEST_FORCEOPEN, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aForceNewList, DispatchWatcher::REQUEST_FORCENEW, aEmpty, aRequest.aModule );
--
-+ AddConversionsToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aConversionList, aRequest.aConversionParams, aRequest.aPrinterName, aRequest.aModule, aRequest.aConversionOut );
- sal_Bool bShutdown( sal_False );
-
- if ( pGlobalOfficeIPCThread )
-diff --git desktop/source/app/officeipcthread.hxx desktop/source/app/officeipcthread.hxx
-index 92a35a5..4f442a9 100644
---- desktop/source/app/officeipcthread.hxx
-+++ desktop/source/app/officeipcthread.hxx
-@@ -66,6 +66,9 @@ struct ProcessDocumentsRequest
- ::rtl::OUString aForceNewList; // Documents that should be forced to create a new document
- ::rtl::OUString aPrinterName; // The printer name that should be used for printing
- ::rtl::OUString aPrintToList; // Documents that should be printed on the given printer
-+ ::rtl::OUString aConversionList;
-+ ::rtl::OUString aConversionParams;
-+ ::rtl::OUString aConversionOut;
- ::osl::Condition *pcProcessed; // pointer condition to be set when the request has been processed
- };
-
-diff --git sfx2/source/bastyp/fltfnc.cxx sfx2/source/bastyp/fltfnc.cxx
-index c42e49d..6d8c9b8 100644
---- sfx2/source/bastyp/fltfnc.cxx
-+++ sfx2/source/bastyp/fltfnc.cxx
-@@ -374,8 +374,8 @@ const SfxFilter* SfxFilterMatcher::GetAnyFilter( SfxFilterFlags nMust, SfxFilter
- sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent(
- SfxMedium& rMedium,
- const SfxFilter**ppFilter,
-- SfxFilterFlags /*nMust*/,
-- SfxFilterFlags /*nDont*/ ) const
-+ SfxFilterFlags nMust,
-+ SfxFilterFlags nDont ) const
- {
- Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection")), UNO_QUERY );
- ::rtl::OUString sTypeName;
-@@ -390,7 +390,11 @@ sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent(
-
- *ppFilter = NULL;
- if ( sTypeName.getLength() )
-- *ppFilter = GetFilter4EA( sTypeName );
-+ {
-+ // make sure filter list is initialized
-+ pImpl->InitForIterating();
-+ *ppFilter = GetFilter4EA( sTypeName, nMust, nDont );
-+ }
-
- return *ppFilter ? ERRCODE_NONE : ERRCODE_ABORT;
- }
diff --git a/patches/dev300/desktop-infilter-option.diff b/patches/dev300/desktop-infilter-option.diff
deleted file mode 100644
index 05d3f68..0000000
--- a/patches/dev300/desktop-infilter-option.diff
+++ /dev/null
@@ -1,143 +0,0 @@
---- desktop/source/app/app.cxx.old 2010-07-30 12:57:03.000000000 +0200
-+++ desktop/source/app/app.cxx 2010-07-30 12:57:38.000000000 +0200
-@@ -2578,6 +2578,7 @@ void Desktop::OpenClients()
- pArgs->GetConversionList( aRequest.aConversionList );
- pArgs->GetConversionParams( aRequest.aConversionParams );
- pArgs->GetConversionOut( aRequest.aConversionOut );
-+ pArgs->GetInFilter( aRequest.aInFilter );
-
- if ( aRequest.aOpenList.getLength() > 0 ||
- aRequest.aViewList.getLength() > 0 ||
---- desktop/source/app/cmdlineargs.cxx 2010-07-22 15:52:08.000000000 +0530
-+++ desktop/source/app/cmdlineargs.cxx 2010-07-22 16:26:35.000000000 +0530
-@@ -544,6 +544,11 @@ sal_Bool CommandLineArgs::InterpretComma
- return sal_True;
- }
- #endif
-+ else if ( aArgStr.Copy(0, 10).EqualsIgnoreCaseAscii( "-infilter=" ))
-+ {
-+ AddStringListParam_Impl( CMD_STRINGPARAM_INFILTER, aArgStr.Copy( 10 ) );
-+ return sal_True;
-+ }
- else if ( aArgStr.Copy(0, 8).EqualsIgnoreCaseAscii( "-accept=" ))
- {
- AddStringListParam_Impl( CMD_STRINGPARAM_ACCEPT, aArgStr.Copy( 8 ) );
-@@ -949,6 +954,13 @@ sal_Bool CommandLineArgs::GetLanguage( :
- return m_aStrSetParams[ CMD_STRINGPARAM_LANGUAGE ];
- }
-
-+sal_Bool CommandLineArgs::GetInFilter( ::rtl::OUString& rPara ) const
-+{
-+ osl::MutexGuard aMutexGuard( m_aMutex );
-+ rPara = m_aStrParams[ CMD_STRINGPARAM_INFILTER ];
-+ return m_aStrSetParams[ CMD_STRINGPARAM_INFILTER ];
-+}
-+
- sal_Bool CommandLineArgs::GetConversionList( ::rtl::OUString& rPara ) const
- {
- osl::MutexGuard aMutexGuard( m_aMutex );
---- desktop/source/app/cmdlineargs.hxx.old 2010-07-30 12:57:03.000000000 +0200
-+++ desktop/source/app/cmdlineargs.hxx 2010-07-30 12:57:38.000000000 +0200
-@@ -94,6 +94,7 @@ class CommandLineArgs
- CMD_STRINGPARAM_CONVERSIONLIST,
- CMD_STRINGPARAM_CONVERSIONPARAMS,
- CMD_STRINGPARAM_CONVERSIONOUT,
-+ CMD_STRINGPARAM_INFILTER,
- CMD_STRINGPARAM_DISPLAY,
- CMD_STRINGPARAM_LANGUAGE,
- CMD_STRINGPARAM_COUNT // must be last element!
-@@ -175,6 +176,7 @@ class CommandLineArgs
- sal_Bool GetPrintToList( ::rtl::OUString& rPara ) const;
- sal_Bool GetPrinterName( ::rtl::OUString& rPara ) const;
- sal_Bool GetLanguage( ::rtl::OUString& rPara ) const;
-+ sal_Bool GetInFilter( ::rtl::OUString& rPara ) const;
- sal_Bool GetConversionList( ::rtl::OUString& rPara ) const;
- sal_Bool GetConversionParams( ::rtl::OUString& rPara ) const;
- sal_Bool GetConversionOut( ::rtl::OUString& rPara ) const;
---- desktop/source/app/cmdlinehelp.cxx.old 2010-07-30 12:57:03.000000000 +0200
-+++ desktop/source/app/cmdlinehelp.cxx 2010-07-30 12:57:38.000000000 +0200
-@@ -116,6 +116,9 @@ namespace desktop
- "-unaccept=<accept-string>\n"\
- " Close an acceptor that was created with -accept=<accept-string>\n"\
- " Use -unnaccept=all to close all open acceptors\n"\
-+ "-infilter=<filter>\n"\
-+ " Force an input filter type if possible\n"\
-+ " Eg. -infilter=\"Calc Office Open XML\"\n"\
- "-convert-to output_file_extension[:output_filter_name] [-outdir ouput_dir] files\n"\
- " Batch convert files.\n"\
- " If -outdir is not specified then current working dir is used as output_dir.\n"\
---- desktop/source/app/dispatchwatcher.cxx.old 2010-07-30 12:57:03.000000000 +0200
-+++ desktop/source/app/dispatchwatcher.cxx 2010-07-30 12:57:38.000000000 +0200
-@@ -182,6 +182,8 @@ sal_Bool DispatchWatcher::executeDispatc
- DispatchList::const_iterator p;
- std::vector< DispatchHolder > aDispatches;
- ::rtl::OUString aAsTemplateArg( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate"));
-+ sal_Bool bSetInputFilter = sal_False;
-+ ::rtl::OUString aForcedInputFilter;
-
- for ( p = aDispatchRequestsList.begin(); p != aDispatchRequestsList.end(); p++ )
- {
-@@ -192,6 +194,15 @@ sal_Bool DispatchWatcher::executeDispatc
- if ( aDispatchRequest.aPreselectedFactory.getLength() )
- nCount++;
-
-+ // Set Input Filter
-+ if ( aDispatchRequest.aRequestType == REQUEST_INFILTER )
-+ {
-+ bSetInputFilter = sal_True;
-+ aForcedInputFilter = aDispatchRequest.aURL;
-+ OfficeIPCThread::RequestsCompleted( 1 );
-+ continue;
-+ }
-+
- // we need more properties for a print/print to request
- if ( aDispatchRequest.aRequestType == REQUEST_PRINT ||
- aDispatchRequest.aRequestType == REQUEST_PRINTTO ||
-@@ -378,8 +389,16 @@ sal_Bool DispatchWatcher::executeDispatc
- aArgs[nIndex].Value <<= sal_True;
- }
-
-- // This is a synchron loading of a component so we don't have to deal with our statusChanged listener mechanism.
-+ // Force input filter, if possible
-+ if( bSetInputFilter )
-+ {
-+ sal_Int32 nIndex = aArgs.getLength();
-+ aArgs.realloc(nIndex+1);
-+ aArgs[nIndex].Name=OUString::createFromAscii("FilterName");
-+ aArgs[nIndex].Value <<= aForcedInputFilter;
-+ }
-
-+ // This is a synchron loading of a component so we don't have to deal with our statusChanged listener mechanism.
- try
- {
- xDoc = Reference < XPrintable >( ::comphelper::SynchronousDispatch::dispatch( xDesktop, aName, aTarget, 0, aArgs ), UNO_QUERY );
---- desktop/source/app/dispatchwatcher.hxx.old 2010-07-30 12:57:03.000000000 +0200
-+++ desktop/source/app/dispatchwatcher.hxx 2010-07-30 12:57:38.000000000 +0200
-@@ -77,6 +77,7 @@ class DispatchWatcher : public ::cppu::W
- REQUEST_FORCEOPEN,
- REQUEST_FORCENEW,
- REQUEST_CONVERSION,
-+ REQUEST_INFILTER,
- REQUEST_BATCHPRINT
- };
-
---- desktop/source/app/officeipcthread.cxx.old 2010-07-30 12:57:03.000000000 +0200
-+++ desktop/source/app/officeipcthread.cxx 2010-07-30 12:57:38.000000000 +0200
-@@ -1011,6 +1011,7 @@ sal_Bool OfficeIPCThread::ExecuteCmdLine
-
- rtl::OUString aEmpty;
- // Create dispatch list for dispatch watcher
-+ AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aInFilter, DispatchWatcher::REQUEST_INFILTER, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aOpenList, DispatchWatcher::REQUEST_OPEN, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aViewList, DispatchWatcher::REQUEST_VIEW, aEmpty, aRequest.aModule );
- AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aStartList, DispatchWatcher::REQUEST_START, aEmpty, aRequest.aModule );
---- desktop/source/app/officeipcthread.hxx.old 2010-07-30 12:57:03.000000000 +0200
-+++ desktop/source/app/officeipcthread.hxx 2010-07-30 12:57:38.000000000 +0200
-@@ -69,6 +69,7 @@ struct ProcessDocumentsRequest
- ::rtl::OUString aConversionList;
- ::rtl::OUString aConversionParams;
- ::rtl::OUString aConversionOut;
-+ ::rtl::OUString aInFilter;
- ::osl::Condition *pcProcessed; // pointer condition to be set when the request has been processed
- };
-
commit 393f7b79717918c0f6921787a3dd79c7026fc44f
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 25 23:28:47 2010 +0200
Moved ui-desktop-integration.diff to the repos.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6b81462..499c29a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -16,7 +16,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
Layout, VBABits, VBAObjects, CalcErrors, CJK, GCJ, Lwp, WPS, \
OOXML, OOXMLExportDevel, OOXMLExport, SVGImport, FrameworkFeature, UnitTesting, \
- PopupRemoval, InternalCairo, Lockdown, \
+ PopupRemoval, InternalCairo, \
FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
CalcRowLimit, Gcc44, Gcc45, BuildFix, WriterDocComparison, \
Toolbars, MySQL, BorderTypes, WriterNavigation
@@ -143,7 +143,7 @@ Solaris: NovellBase, UnstableExtensions
# Universal Upstream-like packages
GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions, GoOoSplash
# OxygenOffice Professional
-OxygenOfficeLinuxCommon : Common, EMFPlus, FontConfigTemporaryHacks, LinuxOnly, SystemBits, Lockdown, \
+OxygenOfficeLinuxCommon : Common, EMFPlus, FontConfigTemporaryHacks, LinuxOnly, SystemBits, \
msaccess, OpenGLTransitions, Mono, AddressBooks, QuickStarter, KDE4,\
GlobalNSPluginSupport, IntegrateExtensions, LiberationFontsOnWindows
OxygenOfficeMacOSXCommon : Common, SystemBits, IntegrateExtensions, LiberationFontsOnWindows
@@ -2735,10 +2735,6 @@ internal-mesa-headers-config_office.diff, fridrich
internal-mesa-headers-mesa.diff, fridrich
-[ Lockdown ]
-# Disable UI [toolbars, menus] customization
-ui-desktop-integration.diff, michael
-
[ InternalCairo ]
cairo-pixman-makefile-mk.diff
cairo-cairo-makefile-mk.diff
diff --git a/patches/dev300/ui-desktop-integration.diff b/patches/dev300/ui-desktop-integration.diff
deleted file mode 100644
index 8ce6ac9..0000000
--- a/patches/dev300/ui-desktop-integration.diff
+++ /dev/null
@@ -1,250 +0,0 @@
----
- framework/source/uielement/toolbarmanager.cxx | 21 +++++++++++-
- .../source/uielement/toolbarsmenucontroller.cxx | 4 ++
- .../schema/org/openoffice/Office/Common.xcs | 7 ++++
- sfx2/sdi/appslots.sdi | 1 +
- sfx2/source/appl/appserv.cxx | 13 +++++++
- svtools/inc/svtools/miscopt.hxx | 2 +
- svtools/source/config/miscopt.cxx | 34 ++++++++++++++++++-
- 7 files changed, 79 insertions(+), 3 deletions(-)
-
-diff --git framework/source/uielement/toolbarmanager.cxx framework/source/uielement/toolbarmanager.cxx
-index e4cb7fd..4a1f2fe 100644
---- framework/source/uielement/toolbarmanager.cxx
-+++ framework/source/uielement/toolbarmanager.cxx
-@@ -256,7 +256,7 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic
- m_bUpdateControllers( sal_False ),
- m_bImageOrientationRegistered( sal_False ),
- m_bImageMirrored( sal_False ),
-- m_bCanBeCustomized( sal_True ),
-+ m_bCanBeCustomized( !SvtMiscOptions().DisableUICustomization() ),
- m_lImageRotation( 0 ),
- m_pToolBar( pToolBar ),
- m_aResourceName( rResourceName ),
-@@ -496,6 +496,24 @@ void ToolBarManager::UpdateControllers()
- {
- RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" );
-
-+ if( !m_bCanBeCustomized )
-+ {
-+ Any a;
-+ Reference< XLayoutManager > xLayoutManager;
-+ Reference< XPropertySet > xFramePropSet( m_xFrame, UNO_QUERY );
-+ if ( xFramePropSet.is() )
-+ a = xFramePropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )));
-+ a >>= xLayoutManager;
-+ Reference< XDockableWindow > xDockable( VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
-+ if ( xLayoutManager.is() && xDockable.is() )
-+ {
-+ ::com::sun::star::awt::Point aPoint;
-+ aPoint.X = aPoint.Y = LONG_MAX;
-+ xLayoutManager->dockWindow( m_aResourceName, DockingArea_DOCKINGAREA_DEFAULT, aPoint );
-+ xLayoutManager->lockWindow( m_aResourceName );
-+ }
-+ }
-+
- if ( !m_bUpdateControllers )
- {
- m_bUpdateControllers = sal_True;
-@@ -1805,6 +1823,7 @@ PopupMenu * ToolBarManager::GetToolBarCustomMeun(ToolBox* pToolBar)
- // Non-configurable toolbars should disable configuration menu items
- aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, sal_False );
- aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, sal_False );
-+ aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, sal_False );
- }
-
- // Disable menu item CLOSE if the toolbar has no closer
-diff --git framework/source/uielement/toolbarsmenucontroller.cxx framework/source/uielement/toolbarsmenucontroller.cxx
-index bb97a82..d9ae3cf 100644
---- framework/source/uielement/toolbarsmenucontroller.cxx
-+++ framework/source/uielement/toolbarsmenucontroller.cxx
-@@ -79,6 +79,7 @@
- #include <unotools/cmdoptions.hxx>
- #include <dispatch/uieventloghelper.hxx>
- #include <rtl/logfile.hxx>
-+#include <svtools/miscopt.hxx>
-
- //_________________________________________________________________________________________________________________
- // Defines
-@@ -376,6 +377,9 @@ sal_Bool ToolbarsMenuController::isContextSensitiveToolbarNonVisible()
-
- void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopupMenu )
- {
-+ if( SvtMiscOptions().DisableUICustomization() )
-+ return;
-+
- vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() );
- resetPopupMenu( rPopupMenu );
-
-diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs
-index d49be9c..bf86e38 100644
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
-@@ -5771,6 +5771,13 @@
- </info>
- <value>false</value>
- </prop>
-+ <prop oor:name="DisableUICustomization" oor:type="xs:boolean">
-+ <info>
-+ <author>RSiddhartha</author>
-+ <desc>Disables the customization of the UI elements.</desc>
-+ </info>
-+ <value>false</value>
-+ </prop>
- <prop oor:name="SymbolSet" oor:type="xs:short">
- <!-- UIHints: Tools Options General View -->
- <info>
-diff --git sfx2/sdi/appslots.sdi sfx2/sdi/appslots.sdi
-index 064d4f5..6e7d89d 100644
---- sfx2/sdi/appslots.sdi
-+++ sfx2/sdi/appslots.sdi
-@@ -181,6 +181,7 @@ interface Application
- SID_AVAILABLE_TOOLBARS
- [
- ExecMethod = MiscExec_Impl ;
-+ StateMethod = MiscState_Impl ;
- ]
- SID_HELP_TUTORIALS
- [
-diff --git sfx2/source/appl/appserv.cxx sfx2/source/appl/appserv.cxx
-index d66dabb..e00f704 100644
---- sfx2/source/appl/appserv.cxx
-+++ sfx2/source/appl/appserv.cxx
-@@ -86,6 +86,7 @@
- #include <unotools/moduleoptions.hxx>
- #include <unotools/regoptions.hxx>
- #include <svtools/helpopt.hxx>
-+#include <svtools/miscopt.hxx>
- #include <toolkit/helper/vclunohelper.hxx>
- #include <tools/shl.hxx>
- #include <unotools/bootstrap.hxx>
-@@ -697,6 +698,18 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
- break;
- }
-
-+ case SID_CONFIG:
-+ case SID_TOOLBOXOPTIONS:
-+ case SID_CONFIGSTATUSBAR:
-+ case SID_CONFIGMENU:
-+ case SID_CONFIGACCEL:
-+ case SID_CONFIGEVENT:
-+ {
-+ if( SvtMiscOptions().DisableUICustomization() )
-+ rSet.DisableItem(nWhich);
-+ break;
-+ }
-+
- case SID_BASICSTOP:
- if ( !StarBASIC::IsRunning() )
- rSet.DisableItem(nWhich);
-diff --git svtools/inc/svtools/miscopt.hxx svtools/inc/svtools/miscopt.hxx
-index a316429..3e4ec38 100644
---- svtools/inc/svtools/miscopt.hxx
-+++ svtools/inc/svtools/miscopt.hxx
-@@ -114,6 +114,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
- void SetTryODMADialog( sal_Bool bSet );
- sal_Bool IsTryUseODMADialogReadOnly() const;
-
-+ sal_Bool DisableUICustomization() const;
-+
- sal_Bool IsPluginsEnabled() const;
- void SetPluginsEnabled( sal_Bool bEnable );
- sal_Bool IsPluginsEnabledReadOnly() const;
-diff --git svtools/source/config/miscopt.cxx svtools/source/config/miscopt.cxx
-index cb7885a..b8a358f 100644
---- svtools/source/config/miscopt.cxx
-+++ svtools/source/config/miscopt.cxx
-@@ -82,8 +82,10 @@ using namespace ::com::sun::star;
- #define PROPERTYHANDLE_TRYODMADIALOG 6
- #define PROPERTYNAME_SHOWLINKWARNINGDIALOG ASCII_STR("ShowLinkWarningDialog")
- #define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
-+#define PROPERTYNAME_DISABLEUICUSTOMIZATION ASCII_STR("DisableUICustomization")
-+#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION 8
-
--#define PROPERTYCOUNT 8
-+#define PROPERTYCOUNT 9
-
- #define VCL_TOOLBOX_STYLE_FLAT ((USHORT)0x0004) // from <vcl/toolbox.hxx>
-
-@@ -116,6 +118,7 @@ class SvtMiscOptions_Impl : public ConfigItem
- sal_Bool m_bIsUseSystemPrintDialogRO;
- sal_Bool m_bShowLinkWarningDialog;
- sal_Bool m_bIsShowLinkWarningDialogRO;
-+ sal_Bool m_bDisableUICustomization;
-
- //-------------------------------------------------------------------------------------------------------------
- // public methods
-@@ -193,6 +196,9 @@ class SvtMiscOptions_Impl : public ConfigItem
- inline sal_Bool IsTryUseODMADialogReadOnly() const
- { return m_bIsTryODMADialogRO; }
-
-+ inline sal_Bool DisableUICustomization() const
-+ { return m_bDisableUICustomization; }
-+
- inline sal_Bool IsPluginsEnabled() const
- { return m_bPluginsEnabled; }
-
-@@ -405,6 +411,13 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
- m_bIsSymbolsStyleRO = seqRO[nProperty];
- break;
- }
-+
-+ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
-+ {
-+ if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
-+ DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
-+ break;
-+ }
- }
- }
-
-@@ -520,6 +533,11 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
- }
- }
- break;
-+ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION : {
-+ if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
-+ DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
-+ }
-+ break;
- }
- }
- }
-@@ -683,6 +701,12 @@ void SvtMiscOptions_Impl::Commit()
- seqValues[nProperty] <<= m_bShowLinkWarningDialog;
- break;
- }
-+
-+ case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
-+ {
-+ seqValues[nProperty] <<= m_bDisableUICustomization;
-+ break;
-+ }
- }
- }
- // Set properties in configuration.
-@@ -704,7 +728,8 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
- PROPERTYNAME_SYMBOLSTYLE,
- PROPERTYNAME_USESYSTEMPRINTDIALOG,
- PROPERTYNAME_TRYODMADIALOG,
-- PROPERTYNAME_SHOWLINKWARNINGDIALOG
-+ PROPERTYNAME_SHOWLINKWARNINGDIALOG,
-+ PROPERTYNAME_DISABLEUICUSTOMIZATION
- };
-
- // Initialize return sequence with these list ...
-@@ -865,6 +890,11 @@ sal_Bool SvtMiscOptions::IsGetSymbolsStyleReadOnly() const
- return m_pDataContainer->IsGetSymbolsStyleReadOnly();
- }
-
-+sal_Bool SvtMiscOptions::DisableUICustomization() const
-+{
-+ return m_pDataContainer->DisableUICustomization();
-+}
-+
- sal_Int16 SvtMiscOptions::GetToolboxStyle() const
- {
- return m_pDataContainer->GetToolboxStyle();
---
-1.7.0.1
-
commit 84445c3ecf336da978600fd1b443bd6f8ce2fa0a
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 25 23:23:29 2010 +0200
Moved linkwarn-* patches to the repos.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 163e982..6b81462 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -16,7 +16,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
Layout, VBABits, VBAObjects, CalcErrors, CJK, GCJ, Lwp, WPS, \
OOXML, OOXMLExportDevel, OOXMLExport, SVGImport, FrameworkFeature, UnitTesting, \
- PopupRemoval, LinkWarningDlg, InternalCairo, Lockdown, \
+ PopupRemoval, InternalCairo, Lockdown, \
FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
CalcRowLimit, Gcc44, Gcc45, BuildFix, WriterDocComparison, \
Toolbars, MySQL, BorderTypes, WriterNavigation
@@ -2562,17 +2562,6 @@ emf+-embedded-mf-image.diff, rodo
vcl-pluggable-mtf-renderer.diff, thorsten
emf+-cppcanvas-input-validation.diff, thorsten
-[ LinkWarningDlg ]
-linkwarn-dlg-in-apps.diff, n#348149, thorsten #fixme
-linkwarn-sfx2-disable-cb-persistency.diff, n#348149, thorsten
-
-linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten
-
-linkwarn-officecfg-disable-msgbox.diff, n#348149, thorsten
-
-linkwarn-svx-warning-dlg.diff, n#348149, thorsten
-linkwarn-sd-no-dnd-links.diff, n#348149, thorsten
-
[ IntegrateExtensions ]
scp2_build_extensions.diff
scp2_makefile_extensions.diff
diff --git a/patches/dev300/linkwarn-dlg-in-apps.diff b/patches/dev300/linkwarn-dlg-in-apps.diff
deleted file mode 100644
index 5049bc1..0000000
--- a/patches/dev300/linkwarn-dlg-in-apps.diff
+++ /dev/null
@@ -1,111 +0,0 @@
-Wire up link warning dlg in applications
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- sc/source/ui/drawfunc/fuins1.cxx | 10 ++++++++++
- sd/source/ui/func/fuinsert.cxx | 12 +++++++++++-
- sw/source/ui/uiview/view2.cxx | 10 ++++++++++
- 3 files changed, 31 insertions(+), 1 deletions(-)
-
-
-diff --git sc/source/ui/drawfunc/fuins1.cxx sc/source/ui/drawfunc/fuins1.cxx
-index 80d6324..70243ac 100644
---- sc/source/ui/drawfunc/fuins1.cxx
-+++ sc/source/ui/drawfunc/fuins1.cxx
-@@ -34,8 +34,10 @@
- #include <svx/svdpage.hxx>
- #include <svx/svdpagv.hxx>
- #include <svx/svdview.hxx>
-+#include <svx/linkwarn.hxx>
- #include <svtools/filter.hxx>
- #include <svl/stritem.hxx>
-+#include <svtools/miscopt.hxx>
- #include <vcl/msgbox.hxx>
- #include <tools/urlobj.hxx>
- #include <avmedia/mediawindow.hxx>
-@@ -289,6 +291,14 @@ FuInsertGraphic::FuInsertGraphic( ScTabViewShell* pViewSh,
- String aFilterName = aDlg.GetCurrentFilter();
- BOOL bAsLink = aDlg.IsAsLink();
-
-+ // really store as link only?
-+ if( bAsLink && SvtMiscOptions().ShowLinkWarningDialog() )
-+ {
-+ SvxLinkWarningDialog aWarnDlg(pWin,aFileName);
-+ if( aWarnDlg.Execute() != RET_OK )
-+ bAsLink = sal_False; // don't store as link
-+ }
-+
- lcl_InsertGraphic( aGraphic, aFileName, aFilterName, bAsLink, FALSE, pViewSh, pWindow, pView );
-
- // append items for recording
-diff --git sd/source/ui/func/fuinsert.cxx sd/source/ui/func/fuinsert.cxx
-index c09fed5..916a512 100755
---- sd/source/ui/func/fuinsert.cxx
-+++ sd/source/ui/func/fuinsert.cxx
-@@ -48,9 +48,11 @@
- #include <sfx2/request.hxx>
- #include <svl/globalnameitem.hxx>
- #include <unotools/pathoptions.hxx>
-+#include <svtools/miscopt.hxx>
- #include <svx/pfiledlg.hxx>
- #include <svx/dialogs.hrc>
- #include <sfx2/linkmgr.hxx>
-+#include <svx/linkwarn.hxx>
- #include <svx/svdetc.hxx>
- #include <avmedia/mediawindow.hxx>
- #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
-@@ -156,7 +158,15 @@ void FuInsertGraphic::DoExecute( SfxRequest& )
-
- if(pGrafObj && aDlg.IsAsLink())
- {
-- // store link only?
-+ // really store as link only?
-+ if( SvtMiscOptions().ShowLinkWarningDialog() )
-+ {
-+ SvxLinkWarningDialog aWarnDlg(mpWindow,aDlg.GetPath());
-+ if( aWarnDlg.Execute() != RET_OK )
-+ return; // don't store as link
-+ }
-+
-+ // store as link
- String aFltName(aDlg.GetCurrentFilter());
- String aPath(aDlg.GetPath());
- pGrafObj->SetGraphicLink(aPath, aFltName);
-diff --git sw/source/ui/uiview/view2.cxx sw/source/ui/uiview/view2.cxx
-index 224ab55..dbabf2b 100755
---- sw/source/ui/uiview/view2.cxx
-+++ sw/source/ui/uiview/view2.cxx
-@@ -48,6 +48,7 @@
- #include <caption.hxx>
- #include <svl/PasswordHelper.hxx>
- #include <svl/urihelper.hxx>
-+#include <svtools/miscopt.hxx>
- #include <sfx2/passwd.hxx>
- #include <sfx2/sfxdlg.hxx>
- #include <sfx2/filedlghelper.hxx>
-@@ -56,6 +57,7 @@
- #include <svx/viewlayoutitem.hxx>
- #include <svx/zoomslideritem.hxx>
- #include <svtools/xwindowitem.hxx>
-+#include <svx/linkwarn.hxx>
- #include <svx/htmlmode.hxx>
- #include <vcl/svapp.hxx>
- #include <vcl/wrkwin.hxx>
-@@ -400,6 +402,14 @@ BOOL SwView::InsertGraphicDlg( SfxRequest& rReq )
- rReq.AppendItem( SfxStringItem( FN_PARAM_2, sGraphicFormat ) );
- rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bAsLink ) );
- }
-+
-+ // really store as link only?
-+ if( bAsLink && SvtMiscOptions().ShowLinkWarningDialog() )
-+ {
-+ SvxLinkWarningDialog aWarnDlg(GetWindow(),pFileDlg->GetPath());
-+ if( aWarnDlg.Execute() != RET_OK )
-+ bAsLink=sal_False; // don't store as link
-+ }
- }
-
- SwWrtShell& rSh = GetWrtShell();
diff --git a/patches/dev300/linkwarn-officecfg-disable-msgbox.diff b/patches/dev300/linkwarn-officecfg-disable-msgbox.diff
deleted file mode 100644
index fc5db92..0000000
--- a/patches/dev300/linkwarn-officecfg-disable-msgbox.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- .../schema/org/openoffice/Office/Common.xcs | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs
-index 2a8e5bf..d49be9c 100644
---- officecfg/registry/schema/org/openoffice/Office/Common.xcs
-+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs
-@@ -5748,6 +5748,15 @@
- </info>
- <value>true</value>
- </prop>
-+ <prop oor:name="ShowLinkWarningDialog" oor:type="xs:boolean">
-+ <info>
-+ <author>THB</author>
-+ <desc>Determines if a warning dialog should be
-+ displayed when a user checks the link checkbox in
-+ the insert graphics dialog.</desc>
-+ </info>
-+ <value>true</value>
-+ </prop>
- <prop oor:name="UseSystemPrintDialog" oor:type="xs:boolean">
- <info>
- <author>PL</author>
---
-1.7.0.1
-
diff --git a/patches/dev300/linkwarn-sd-no-dnd-links.diff b/patches/dev300/linkwarn-sd-no-dnd-links.diff
deleted file mode 100644
index 5c855d5..0000000
--- a/patches/dev300/linkwarn-sd-no-dnd-links.diff
+++ /dev/null
@@ -1,24 +0,0 @@
----
- sd/source/ui/view/sdview4.cxx | 4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git sd/source/ui/view/sdview4.cxx sd/source/ui/view/sdview4.cxx
-index dce201f..9ec90c5 100755
---- sd/source/ui/view/sdview4.cxx
-+++ sd/source/ui/view/sdview4.cxx
-@@ -395,12 +395,8 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG )
- if( !pGraphicFilter->ImportGraphic( aGraphic, aURL ) )
- {
- sal_Int8 nTempAction = ( aIter == maDropFileVector.begin() ) ? mnAction : 0;
-- const bool bLink = ( ( nTempAction & DND_ACTION_LINK ) != 0 );
- SdrGrafObj* pGrafObj = InsertGraphic( aGraphic, nTempAction, maDropPos, NULL, NULL );
-
-- if( pGrafObj && bLink )
-- pGrafObj->SetGraphicLink( aCurrentDropFile, String() );
--
- // return action from first inserted graphic
- if( aIter == maDropFileVector.begin() )
- mnAction = nTempAction;
---
-1.7.0.1
-
diff --git a/patches/dev300/linkwarn-sfx2-disable-cb-persistency.diff b/patches/dev300/linkwarn-sfx2-disable-cb-persistency.diff
deleted file mode 100644
index 433a843..0000000
--- a/patches/dev300/linkwarn-sfx2-disable-cb-persistency.diff
+++ /dev/null
@@ -1,38 +0,0 @@
----
- sfx2/source/dialog/filedlghelper.cxx | 12 ------------
- 1 files changed, 0 insertions(+), 12 deletions(-)
-
-diff --git sfx2/source/dialog/filedlghelper.cxx sfx2/source/dialog/filedlghelper.cxx
-index 3167c13..87859d6 100644
---- sfx2/source/dialog/filedlghelper.cxx
-+++ sfx2/source/dialog/filedlghelper.cxx
-@@ -1996,11 +1996,7 @@ void FileDialogHelper_Impl::saveConfig()
-
- try
- {
-- aValue = xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0 );
- sal_Bool bValue = sal_False;
-- aValue >>= bValue;
-- aUserData.SetToken( 0, ' ', String::CreateFromInt32( (sal_Int32) bValue ) );
--
- aValue = xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0 );
- bValue = sal_False;
- aValue >>= bValue;
-@@ -2140,14 +2136,6 @@ void FileDialogHelper_Impl::loadConfig()
- {
- try
- {
-- // respect the last "insert as link" state
-- sal_Bool bLink = (sal_Bool) aUserData.GetToken( 0, ' ' ).ToInt32();
-- if ( !xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0 ).hasValue() )
-- {
-- aValue <<= bLink;
-- xDlg->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aValue );
-- }
--
- // respect the last "show preview" state
- sal_Bool bShowPreview = (sal_Bool) aUserData.GetToken( 1, ' ' ).ToInt32();
- if ( !xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0 ).hasValue() )
---
-1.7.0.1
-
diff --git a/patches/dev300/linkwarn-svtools-miscopts-bits.diff b/patches/dev300/linkwarn-svtools-miscopts-bits.diff
deleted file mode 100644
index ff92b13..0000000
--- a/patches/dev300/linkwarn-svtools-miscopts-bits.diff
+++ /dev/null
@@ -1,150 +0,0 @@
----
- svtools/inc/svtools/miscopt.hxx | 4 ++
- svtools/source/config/miscopt.cxx | 59 +++++++++++++++++++++++++++++++++++-
- 2 files changed, 61 insertions(+), 2 deletions(-)
-
-diff --git svtools/inc/svtools/miscopt.hxx svtools/inc/svtools/miscopt.hxx
-index c810068..a316429 100644
---- svtools/inc/svtools/miscopt.hxx
-+++ svtools/inc/svtools/miscopt.hxx
-@@ -139,6 +139,10 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
-
- sal_Bool UseSystemPrintDialog() const;
- void SetUseSystemPrintDialog( sal_Bool bSet );
-+
-+ sal_Bool ShowLinkWarningDialog() const;
-+ void SetShowLinkWarningDialog( sal_Bool bSet );
-+ sal_Bool IsShowLinkWarningDialogReadOnly() const;
-
- //-------------------------------------------------------------------------------------------------------------
- // private methods
-diff --git svtools/source/config/miscopt.cxx svtools/source/config/miscopt.cxx
-index 10b2574..cb7885a 100644
---- svtools/source/config/miscopt.cxx
-+++ svtools/source/config/miscopt.cxx
-@@ -80,8 +80,10 @@ using namespace ::com::sun::star;
- #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 PROPERTYCOUNT 7
-+#define PROPERTYCOUNT 8
-
- #define VCL_TOOLBOX_STYLE_FLAT ((USHORT)0x0004) // from <vcl/toolbox.hxx>
-
-@@ -112,6 +114,8 @@ class SvtMiscOptions_Impl : public ConfigItem
- sal_Bool m_bIsToolboxStyleRO;
- sal_Bool m_bUseSystemPrintDialog;
- sal_Bool m_bIsUseSystemPrintDialogRO;
-+ sal_Bool m_bShowLinkWarningDialog;
-+ sal_Bool m_bIsShowLinkWarningDialogRO;
-
- //-------------------------------------------------------------------------------------------------------------
- // public methods
-@@ -237,6 +241,15 @@ class SvtMiscOptions_Impl : public ConfigItem
- inline sal_Bool IsUseSystemPrintDialogReadOnly() const
- { return m_bIsUseSystemPrintDialogRO; }
-
-+ inline sal_Bool ShowLinkWarningDialog() const
-+ { return m_bShowLinkWarningDialog; }
-+
-+ void SetShowLinkWarningDialog( sal_Bool bSet )
-+ { m_bShowLinkWarningDialog = bSet; SetModified(); }
-+
-+ sal_Bool IsShowLinkWarningDialogReadOnly() const
-+ { return m_bIsShowLinkWarningDialogRO; }
-+
- void AddListenerLink( const Link& rLink );
- void RemoveListenerLink( const Link& rLink );
- void CallListeners();
-@@ -286,6 +299,8 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
- , m_bIsToolboxStyleRO( sal_False )
- , m_bUseSystemPrintDialog( sal_False )
- , m_bIsUseSystemPrintDialogRO( sal_False )
-+ , m_bShowLinkWarningDialog( sal_True )
-+ , m_bIsShowLinkWarningDialogRO( sal_False )
-
- {
- // Use our static list of configuration keys to get his values.
-@@ -368,6 +383,16 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
- break;
- }
-
-+ case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG :
-+ {
-+ if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) )
-+ {
-+ DBG_ERROR("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" );
-+ }
-+ m_bIsShowLinkWarningDialogRO = seqRO[nProperty];
-+ break;
-+ }
-+
- case PROPERTYHANDLE_SYMBOLSTYLE :
- {
- ::rtl::OUString aSymbolsStyle;
-@@ -478,6 +503,13 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
- }
- }
- break;
-+ case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG : {
-+ if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) )
-+ {
-+ DBG_ERROR("Wrong type of \"Misc\\ShowLinkWarningDialog\"!" );
-+ }
-+ }
-+ break;
- case PROPERTYHANDLE_SYMBOLSTYLE : {
- ::rtl::OUString aSymbolsStyle;
- if( seqValues[nProperty] >>= aSymbolsStyle )
-@@ -644,6 +676,13 @@ void SvtMiscOptions_Impl::Commit()
- seqValues[nProperty] <<= m_bUseSystemPrintDialog;
- break;
- }
-+
-+ case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG :
-+ {
-+ if ( !m_bIsShowLinkWarningDialogRO )
-+ seqValues[nProperty] <<= m_bShowLinkWarningDialog;
-+ break;
-+ }
- }
- }
- // Set properties in configuration.
-@@ -664,7 +703,8 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
- PROPERTYNAME_USESYSTEMFILEDIALOG,
- PROPERTYNAME_SYMBOLSTYLE,
- PROPERTYNAME_USESYSTEMPRINTDIALOG,
-- PROPERTYNAME_TRYODMADIALOG
-+ PROPERTYNAME_TRYODMADIALOG,
-+ PROPERTYNAME_SHOWLINKWARNINGDIALOG
- };
-
- // Initialize return sequence with these list ...
-@@ -850,6 +890,21 @@ void SvtMiscOptions::SetUseSystemPrintDialog( sal_Bool bEnable )
- m_pDataContainer->SetUseSystemPrintDialog( bEnable );
- }
-
-+sal_Bool SvtMiscOptions::ShowLinkWarningDialog() const
-+{
-+ return m_pDataContainer->ShowLinkWarningDialog();
-+}
-+
-+void SvtMiscOptions::SetShowLinkWarningDialog( sal_Bool bSet )
-+{
-+ m_pDataContainer->SetShowLinkWarningDialog( bSet );
-+}
-+
-+sal_Bool SvtMiscOptions::IsShowLinkWarningDialogReadOnly() const
-+{
-+ return m_pDataContainer->IsShowLinkWarningDialogReadOnly();
-+}
-+
- //*****************************************************************************************************************
- // private method
- //*****************************************************************************************************************
---
-1.7.0.1
-
diff --git a/patches/dev300/linkwarn-svx-warning-dlg.diff b/patches/dev300/linkwarn-svx-warning-dlg.diff
deleted file mode 100644
index 4891acb..0000000
--- a/patches/dev300/linkwarn-svx-warning-dlg.diff
+++ /dev/null
@@ -1,470 +0,0 @@
----
- svx/inc/svx/dialogs.hrc | 3 +-
- svx/inc/svx/linkwarn.hxx | 60 ++++++++++++++++
- svx/prj/d.lst | 5 ++
- svx/source/dialog/linkwarn.cxx | 154 ++++++++++++++++++++++++++++++++++++++++
- svx/source/dialog/linkwarn.hrc | 66 +++++++++++++++++
- svx/source/dialog/linkwarn.src | 92 ++++++++++++++++++++++++
- svx/source/dialog/makefile.mk | 2 +
- 7 files changed, 381 insertions(+), 1 deletions(-)
- create mode 100644 svx/inc/svx/linkwarn.hxx
- create mode 100644 svx/source/dialog/linkwarn.cxx
- create mode 100644 svx/source/dialog/linkwarn.hrc
- create mode 100644 svx/source/dialog/linkwarn.src
-
-diff --git svx/inc/svx/dialogs.hrc svx/inc/svx/dialogs.hrc
-index 67df9fa..fa1e703 100755
---- svx/inc/svx/dialogs.hrc
-+++ svx/inc/svx/dialogs.hrc
-@@ -35,7 +35,7 @@
- // Resource-Id's ------------------------------------------------------------
-
- // Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings)
--#define RID_SVX_FIRSTFREE 305
-+#define RID_SVX_FIRSTFREE 314
-
- // some strings also used in CUI
- #define RID_SVXERRCTX (RID_SVX_START + 351)
-@@ -379,6 +379,7 @@
- #define RID_SVXDLG_TEXTCONTROL_CHARATTR (RID_SVX_START + 286)
- #define RID_SVXDLG_TEXTCONTROL_PARAATTR (RID_SVX_START + 287)
-
-+#define RID_SVXDLG_LINK_WARNING (RID_SVX_START + 313)
- // !!! please update RID_SVX_FIRSTFREE !!! see line 46
-
- // Strings ------------------------------------------------------------------
-diff --git svx/inc/svx/linkwarn.hxx svx/inc/svx/linkwarn.hxx
-new file mode 100644
-index 0000000..052c178
---- /dev/null
-+++ svx/inc/svx/linkwarn.hxx
-@@ -0,0 +1,60 @@
-+/*************************************************************************
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: linkwarn.hxx,v $
-+ *
-+ * $Revision: $
-+ *
-+ * last change: $Author: $ $Date: $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ ************************************************************************/
-+#ifndef _SFX_LINKWARN_HXX
-+#define _SFX_LINKWARN_HXX
-+
-+#include <vcl/button.hxx>
-+#include <vcl/fixed.hxx>
-+#include <sfx2/basedlgs.hxx>
-+#include "svx/svxdllapi.h"
-+
-+class SVX_DLLPUBLIC SvxLinkWarningDialog : public SfxModalDialog
-+{
-+private:
-+ FixedImage m_aQueryImage;
-+ FixedText m_aInfoText;
-+ OKButton m_aLinkGraphicBtn;
-+ CancelButton m_aEmbedGraphicBtn;
-+ FixedLine m_aOptionLine;
-+ CheckBox m_aWarningOnBox;
-+
-+ void InitSize();
-+
-+public:
-+ SvxLinkWarningDialog( Window* pParent, const String& _rFileName );
-+ virtual ~SvxLinkWarningDialog();
-+};
-+
-+#endif // #ifndef _SFX_LINKWARN_HXX
-diff --git svx/prj/d.lst svx/prj/d.lst
-index 2403c04..d79e421 100644
---- svx/prj/d.lst
-+++ svx/prj/d.lst
-@@ -146,6 +146,11 @@ mkdir: %_DEST%\inc%_EXT%\svx
- ..\inc\svx\simptabl.hxx %_DEST%\inc%_EXT%\svx\simptabl.hxx
- ..\inc\svx\ctredlin.hxx %_DEST%\inc%_EXT%\svx\ctredlin.hxx
- ..\inc\svx\bmpmask.hxx %_DEST%\inc%_EXT%\svx\bmpmask.hxx
-+..\inc\svx\linkwarn.hxx %_DEST%\inc%_EXT%\svx\linkwarn.hxx
-+..\inc\svx\borderline.hxx %_DEST%\inc%_EXT%\svx\borderline.hxx
-+..\inc\svx\boxitem.hxx %_DEST%\inc%_EXT%\svx\boxitem.hxx
-+..\inc\svx\brkitem.hxx %_DEST%\inc%_EXT%\svx\brkitem.hxx
-+..\inc\svx\brshitem.hxx %_DEST%\inc%_EXT%\svx\brshitem.hxx
- ..\inc\svx\camera3d.hxx %_DEST%\inc%_EXT%\svx\camera3d.hxx
- ..\inc\svx\charmap.hxx %_DEST%\inc%_EXT%\svx\charmap.hxx
- ..\inc\svx\checklbx.hxx %_DEST%\inc%_EXT%\svx\checklbx.hxx
-diff --git svx/source/dialog/linkwarn.cxx svx/source/dialog/linkwarn.cxx
-new file mode 100644
-index 0000000..306d0ea
---- /dev/null
-+++ svx/source/dialog/linkwarn.cxx
-@@ -0,0 +1,154 @@
-+/*************************************************************************
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: linkwarn.cxx,v $
-+ *
-+ * $Revision: $
-+ *
-+ * last change: $Author: $ $Date: $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ ************************************************************************/
-+
-+// MARKER(update_precomp.py): autogen include statement, do not remove
-+#include "precompiled_svx.hxx"
-+
-+#include "linkwarn.hrc"
-+#include "svx/linkwarn.hxx"
-+#include "svx/dialogs.hrc"
-+#include "svx/dialmgr.hxx"
-+#include <vcl/msgbox.hxx>
-+#include <sfx2/basedlgs.hxx>
-+#include <svtools/miscopt.hxx>
-+
-+SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const String& _rFileName ) :
-+ SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_LINK_WARNING ) ),
-+ m_aQueryImage ( this, SVX_RES( FI_QUERY ) ),
-+ m_aInfoText ( this, SVX_RES( FT_INFOTEXT ) ),
-+ m_aLinkGraphicBtn ( this, SVX_RES( PB_OK ) ),
-+ m_aEmbedGraphicBtn ( this, SVX_RES( PB_NO ) ),
-+ m_aOptionLine ( this, SVX_RES( FL_OPTION ) ),
-+ m_aWarningOnBox ( this, SVX_RES( CB_WARNING_OFF ) )
-+{
-+ FreeResource();
-+
-+ // set questionmark image
-+ m_aQueryImage.SetImage( QueryBox::GetStandardImage() );
-+
-+ // replace filename
-+ String sInfoText = m_aInfoText.GetText();
-+ sInfoText.SearchAndReplaceAll(
-+ UniString::CreateFromAscii(
-+ RTL_CONSTASCII_STRINGPARAM( "%FILENAME" ) ), _rFileName );
-+ m_aInfoText.SetText( sInfoText );
-+
-+ // load state of "warning on" checkbox from misc options
-+ SvtMiscOptions aMiscOpt;
-+ m_aWarningOnBox.Check( aMiscOpt.ShowLinkWarningDialog() == sal_True );
-+ if( aMiscOpt.IsShowLinkWarningDialogReadOnly() )
-+ m_aWarningOnBox.Disable();
-+
-+ // set focus to Cancel button
-+ m_aEmbedGraphicBtn.GrabFocus();
-+
-+ // calculate and set the size of the dialog and its controls
-+ InitSize();
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+SvxLinkWarningDialog::~SvxLinkWarningDialog()
-+{
-+ // save value of "warning off" checkbox, if necessary
-+ SvtMiscOptions aMiscOpt;
-+ sal_Bool bChecked = m_aWarningOnBox.IsChecked();
-+ if ( aMiscOpt.ShowLinkWarningDialog() != bChecked )
-+ aMiscOpt.SetShowLinkWarningDialog( bChecked );
-+}
-+
-+// -----------------------------------------------------------------------
-+
-+void SvxLinkWarningDialog::InitSize()
-+{
-+ // text of checkbox to wide -> add new line
-+ long nTxtW = m_aWarningOnBox.GetCtrlTextWidth( m_aWarningOnBox.GetText() ) + IMPL_EXTRA_BUTTON_WIDTH;
-+ long nCtrlW = m_aWarningOnBox.GetSizePixel().Width();
-+ if ( nTxtW >= nCtrlW )
-+ {
-+ long nTextHeight = m_aWarningOnBox.GetTextHeight();
-+ Size aNewSize = m_aWarningOnBox.GetSizePixel();
-+ aNewSize.Height() += nTextHeight;
-+ m_aWarningOnBox.SetSizePixel( aNewSize );
-+ aNewSize = GetSizePixel();
-+ aNewSize.Height() += nTextHeight;
-+ SetSizePixel( aNewSize );
-+ }
-+
-+ // align the size of the information text control (FixedText) to its content
-+ Size aMinSize = m_aInfoText.CalcMinimumSize( m_aInfoText.GetSizePixel().Width() );
-+ long nTxtH = aMinSize.Height();
-+ long nCtrlH = m_aInfoText.GetSizePixel().Height();
-+ long nDelta = ( nCtrlH - nTxtH );
-+ Size aNewSize = m_aInfoText.GetSizePixel();
-+ aNewSize.Height() -= nDelta;
-+ m_aInfoText.SetSizePixel( aNewSize );
-+
-+ // new position for the succeeding windows
-+ Window* pWins[] =
-+ {
-+ &m_aLinkGraphicBtn, &m_aEmbedGraphicBtn, &m_aOptionLine, &m_aWarningOnBox
-+ };
-+ Window** pCurrent = pWins;
-+ for ( sal_uInt32 i = 0; i < sizeof(pWins) / sizeof(*pWins); ++i, ++pCurrent )
-+ {
-+ Point aNewPos = (*pCurrent)->GetPosPixel();
-+ aNewPos.Y() -= nDelta;
-+ (*pCurrent)->SetPosPixel( aNewPos );
-+ }
-+
-+ // new size of the dialog
-+ aNewSize = GetSizePixel();
-+ aNewSize.Height() -= nDelta;
-+ SetSizePixel( aNewSize );
-+
-+ // recalculate the size and position of the buttons
-+ nTxtW = m_aLinkGraphicBtn.GetCtrlTextWidth( m_aLinkGraphicBtn.GetText() );
-+ long nTemp = m_aEmbedGraphicBtn.GetCtrlTextWidth( m_aEmbedGraphicBtn.GetText() );
-+ if ( nTemp > nTxtW )
-+ nTxtW = nTemp;
-+ nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
-+ Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT );
-+ Point aPos = m_aLinkGraphicBtn.GetPosPixel();
-+ aPos.X() = ( aNewSize.Width() - (2*nTxtW) - a3Size.Width() ) / 2;
-+ long nDefX = m_aWarningOnBox.GetPosPixel().X();
-+ if ( nDefX < aPos.X() )
-+ aPos.X() = nDefX;
-+ aNewSize = m_aLinkGraphicBtn.GetSizePixel();
-+ aNewSize.Width() = nTxtW;
-+ m_aLinkGraphicBtn.SetPosSizePixel( aPos, aNewSize );
-+ aPos.X() += nTxtW + a3Size.Width();
-+ m_aEmbedGraphicBtn.SetPosSizePixel( aPos, aNewSize );
-+}
-diff --git svx/source/dialog/linkwarn.hrc svx/source/dialog/linkwarn.hrc
-new file mode 100644
-index 0000000..f94294e
---- /dev/null
-+++ svx/source/dialog/linkwarn.hrc
-@@ -0,0 +1,66 @@
-+/*************************************************************************
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: linkwarn.hrc,v $
-+ *
-+ * $Revision: $
-+ *
-+ * last change: $Author: $ $Date: $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ ************************************************************************/
-+#ifndef _SVX_LINKWARN_HRC
-+#define _SVX_LINKWARN_HRC
-+
-+#include <svtools/controldims.hrc>
-+
-+// dialog ids
-+#define FI_QUERY 10
-+#define FT_INFOTEXT 11
-+#define PB_OK 12
-+#define PB_NO 13
-+#define FL_OPTION 15
-+#define CB_WARNING_OFF 16
-+
-+// --------- general metrics ---------
-+
-+#define SYMBOL_EDGE 20
-+#define DIALOG_WIDTH 220
-+#define INFO_TEXT_LINES 11
-+
-+#define AW_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT)
-+#define AW_COL_2 (AW_COL_1+SYMBOL_EDGE+RSC_SP_CTRL_DESC_X)
-+#define AW_COL_3 (AW_COL_2+RSC_CD_PUSHBUTTON_WIDTH+RSC_SP_CTRL_DESC_X)
-+#define AW_COL_4 (DIALOG_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH)
-+
-+#define AW_ROW_1 (RSC_SP_DLG_INNERBORDER_TOP)
-+#define AW_ROW_2 (AW_ROW_1+INFO_TEXT_LINES*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
-+#define AW_ROW_3 (AW_ROW_2+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y)
-+#define AW_ROW_4 (AW_ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-+
-+#define DIALOG_HEIGHT (AW_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_DLG_INNERBORDER_BOTTOM)
-+
-+#endif
-diff --git svx/source/dialog/linkwarn.src svx/source/dialog/linkwarn.src
-new file mode 100644
-index 0000000..b9119ca
---- /dev/null
-+++ svx/source/dialog/linkwarn.src
-@@ -0,0 +1,92 @@
-+/*************************************************************************
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile: linkwarn.src,v $
-+ *
-+ * $Revision: $
-+ *
-+ * last change: $Author: $ $Date: $
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library 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 for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ ************************************************************************/
-+
-+#include "linkwarn.hrc"
-+#include "svx/dialogs.hrc"
-+#include "helpid.hrc"
-+
-+ModalDialog RID_SVXDLG_LINK_WARNING
-+{
-+ Size = MAP_APPFONT( DIALOG_WIDTH, DIALOG_HEIGHT );
-+ OutputSize = TRUE;
-+ Closeable = FALSE;
-+ Moveable = TRUE;
-+ SVLook = TRUE;
-+
-+ Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION";
-+
-+ FixedImage FI_QUERY
-+ {
-+ Pos = MAP_APPFONT( AW_COL_1, AW_ROW_1 );
-+ Size = MAP_APPFONT( SYMBOL_EDGE, SYMBOL_EDGE );
-+ };
-+ FixedText FT_INFOTEXT
-+ {
-+ Pos = MAP_APPFONT( AW_COL_2, AW_ROW_1 );
-+ Size = MAP_APPFONT( DIALOG_WIDTH-AW_COL_2-RSC_SP_DLG_INNERBORDER_RIGHT, INFO_TEXT_LINES*RSC_CD_FIXEDTEXT_HEIGHT );
-+ NoLabel = TRUE;
-+ Wordbreak = TRUE;
-+ Text [ en-US ] = "The file %FILENAME will not be stored along with your document, but only referenced as a link. This is dangerous if you move and/or rename the files. Do you want to embed the graphic instead?";
-+ Text [ de-DE ] = "Die Datei %FILENAME wird nicht zusammen mit dem Dokument gespeichert, sondern nur als Verweis referenziert. Dies kann zu Problemen führen, wenn die Dateien verschoben und/oder umbenannt werden. Möchten Sie stattdessen die Grafik als eingebettetes Objekt einfügen?";
-+ };
-+ OKButton PB_OK
-+ {
-+ Pos = MAP_APPFONT( AW_COL_2, AW_ROW_2 );
-+ Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-+ DefButton = TRUE ;
-+ Text [ en-US ] = "~Keep Link";
-+ Text [ de-DE ] = "~Als Verweis einfügen";
-+ };
-+ CancelButton PB_NO
-+ {
-+ Pos = MAP_APPFONT( AW_COL_3, AW_ROW_2 );
-+ Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-+ Text [ en-US ] = "~Embed Graphic";
-+ Text [ de-DE ] = "~Eingebettet einfügen";
-+ };
-+ FixedLine FL_OPTION
-+ {
-+ Pos = MAP_APPFONT( 0, AW_ROW_3 );
-+ Size = MAP_APPFONT( DIALOG_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-+ };
-+ CheckBox CB_WARNING_OFF
-+ {
-+ Pos = MAP_APPFONT( AW_COL_2, AW_ROW_4 );
-+ Size = MAP_APPFONT( DIALOG_WIDTH-AW_COL_2-RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT );
-+ WordBreak = TRUE ;
-+ Text [ en-US ] = "~Ask when linking a graphic";
-+ Text [ de-DE ] = "~Nachfragen falls Grafik als Verweis eingefügt wird";
-+ };
-+};
-diff --git svx/source/dialog/makefile.mk svx/source/dialog/makefile.mk
-index ac608fa..3805de9 100644
---- svx/source/dialog/makefile.mk
-+++ svx/source/dialog/makefile.mk
-@@ -56,6 +56,7 @@ SRC1FILES = \
- imapdlg.src \
- langbox.src \
- language.src \
-+ linkwarn.src \
- passwd.src \
- prtqry.src \
- rubydialog.src\
-@@ -108,6 +109,7 @@ LIB2OBJFILES= \
- $(SLO)$/hyprlink.obj \
- $(SLO)$/imapdlg.obj \
- $(SLO)$/imapwnd.obj \
-+ $(SLO)$/linkwarn.obj \
- $(SLO)$/measctrl.obj \
- $(SLO)$/orienthelper.obj \
- $(SLO)$/pagectrl.obj \
---
-1.7.0.1
-
commit 4d665385ff3aa6b4a8d44be6686f9844b4531256
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 25 22:37:38 2010 +0200
Moved novell-win32-odma.diff to the repos.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index bc2758b..163e982 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2470,8 +2470,6 @@ unit-sc.diff
# experimental unit testing using writer core
# unittesting-more-sw.diff, thorsten
-[ Features ]
-novell-win32-odma.diff, i#6885, i#32741, tml
[ VOSremoval ]
diff --git a/patches/dev300/novell-win32-odma.diff b/patches/dev300/novell-win32-odma.diff
deleted file mode 100644
index 3c83d06..0000000
--- a/patches/dev300/novell-win32-odma.diff
+++ /dev/null
@@ -1,2632 +0,0 @@
----
- cui/source/options/optgdlg.cxx | 44 ++
- cui/source/options/optgdlg.hrc | 8 +-
- cui/source/options/optgdlg.hxx | 4 +
- cui/source/options/optgdlg.src | 19 +-
- desktop/source/app/cmdlineargs.cxx | 9 +
- fpicker/prj/build.lst | 1 +
- fpicker/source/generic/fpicker.cxx | 28 +-
- fpicker/source/generic/makefile.mk | 1 +
- fpicker/source/odma/ODMAFilePicker.cxx | 565 ++++++++++++++++++++
- fpicker/source/odma/ODMAFilePicker.hxx | 242 +++++++++
- fpicker/source/odma/ODMAFolderPicker.cxx | 189 +++++++
- fpicker/source/odma/ODMAFolderPicker.hxx | 118 ++++
- fpicker/source/odma/exports.map | 8 +
- fpicker/source/odma/fps_odma.cxx | 90 +++
- fpicker/source/odma/makefile.mk | 79 +++
- framework/prj/build.lst | 2 +-
- .../source/uielement/recentfilesmenucontroller.cxx | 40 ++
- framework/util/makefile.mk | 1 +
- .../data/org/openoffice/ucb/Configuration.xcu | 11 +
- .../schema/org/openoffice/Office/Common.xcs | 7 +
- scp2/source/ooo/directory_ooo.scp | 5 +
- scp2/source/ooo/file_library_ooo.scp | 8 +
- scp2/source/ooo/file_ooo.scp | 32 ++
- solenv/bin/modules/installer/windows/component.pm | 5 +
- solenv/bin/modules/installer/windows/directory.pm | 6 +
- solenv/inc/libs.mk | 4 +
- svtools/inc/svtools/miscopt.hxx | 4 +
- svtools/source/config/miscopt.cxx | 59 ++-
- ucb/prj/build.lst | 1 +
- ucb/prj/d.lst | 5 +
- ucb/source/ucp/odma/makefile.mk | 11 +-
- ucb/source/ucp/odma/odma_content.cxx | 100 +---
- ucb/source/ucp/odma/odma_content.hxx | 2 +-
- ucb/source/ucp/odma/odma_contentprops.hxx | 1 +
- ucb/source/ucp/odma/odma_datasupplier.cxx | 3 +-
- ucb/source/ucp/odma/odma_lib.cxx | 25 +-
- ucb/source/ucp/odma/odma_lib.hxx | 76 ++--
- ucb/source/ucp/odma/odma_provider.cxx | 8 +-
- ucb/source/ucp/odma/odma_provider.hxx | 15 +-
- ucb/source/ucp/odma/odma_services.cxx | 14 +-
- ucb/source/ucp/odma/ucpodma.xml | 2 +-
- 41 files changed, 1694 insertions(+), 158 deletions(-)
- create mode 100644 fpicker/source/odma/ODMAFilePicker.cxx
- create mode 100644 fpicker/source/odma/ODMAFilePicker.hxx
- create mode 100644 fpicker/source/odma/ODMAFolderPicker.cxx
- create mode 100644 fpicker/source/odma/ODMAFolderPicker.hxx
- create mode 100644 fpicker/source/odma/exports.map
- create mode 100644 fpicker/source/odma/fps_odma.cxx
- create mode 100644 fpicker/source/odma/makefile.mk
-
-diff --git cui/source/options/optgdlg.cxx cui/source/options/optgdlg.cxx
-index 19c8c02..f532b5b 100644
---- cui/source/options/optgdlg.cxx
-+++ cui/source/options/optgdlg.cxx
-@@ -205,6 +205,7 @@ 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 ) ),
-@@ -228,6 +229,31 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
- aPrintDlgCB.Hide();
- #endif
-
-+#ifdef WNT
-+ aFileDlgCB.SetToggleHdl( LINK( this, OfaMiscTabPage, OnFileDlgToggled ) );
-+#else
-+ {
-+ aODMADlgCB.Hide();
-+ // rearrange the following controls
-+ Point aNewPos = aDocStatusFL.GetPosPixel();
-+ long nDelta = aNewPos.Y() - aODMADlgCB.GetPosPixel().Y();
-+
-+ Window* pWins[] =
-+ {
-+ &aDocStatusFL, &aDocStatusCB, &aTwoFigureFL,
-+ &aInterpretFT, &aYearValueField, &aToYearFT
-+ };
-+ Window** pCurrent = pWins;
-+ const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[ 0 ] );
-+ for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent )
-+ {
-+ aNewPos = (*pCurrent)->GetPosPixel();
-+ aNewPos.Y() -= nDelta;
-+ (*pCurrent)->SetPosPixel( aNewPos );
-+ }
-+ }
-+#endif
-+
- if ( !aFileDlgCB.IsVisible() )
- {
- // rearrange the following controls
-@@ -317,6 +343,14 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
- }
- }
-
-+#ifdef WNT
-+IMPL_LINK( OfaMiscTabPage, OnFileDlgToggled, CheckBox*, EMPTYARG )
-+{
-+ aODMADlgCB.Enable( !aFileDlgCB.IsChecked() );
-+ return 0;
-+}
-+#endif
-+
- // -----------------------------------------------------------------------
-
- OfaMiscTabPage::~OfaMiscTabPage()
-@@ -371,6 +405,13 @@ BOOL OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
- bModified = TRUE;
- }
-
-+ if ( aODMADlgCB.IsChecked() != aODMADlgCB.GetSavedValue() )
-+ {
-+ SvtMiscOptions aMiscOpt;
-+ aMiscOpt.SetTryODMADialog( aODMADlgCB.IsChecked() );
-+ bModified = TRUE;
-+ }
-+
- if ( aDocStatusCB.IsChecked() != aDocStatusCB.GetSavedValue() )
- {
- SvtPrintWarningOptions aPrintOptions;
-@@ -420,6 +461,9 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
- aPrintDlgCB.Check( !aMiscOpt.UseSystemPrintDialog() );
- aPrintDlgCB.SaveValue();
-
-+ aODMADlgCB.Check( aMiscOpt.TryODMADialog() );
-+ aODMADlgCB.SaveValue();
-+
- SvtPrintWarningOptions aPrintOptions;
- aDocStatusCB.Check(aPrintOptions.IsModifyDocumentOnPrintingAllowed());
- aDocStatusCB.SaveValue();
-diff --git cui/source/options/optgdlg.hrc cui/source/options/optgdlg.hrc
-index 7df69da..db1ded0 100644
---- cui/source/options/optgdlg.hrc
-+++ cui/source/options/optgdlg.hrc
-@@ -53,9 +53,10 @@
- #define ROW6 (ROW5+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list