summaryrefslogtreecommitdiff
path: root/desktop/source
AgeCommit message (Collapse)Author
2013-02-07Cleanly remove components from rdb again that fail during live insertionStephan Bergmann
Such failure happens e.g. for components that bring along duplicate UNO implementation names, and if they ever got added to an rdb, LO would afterwards refuse to start forever. Change-Id: Ia62ac496547a45f5a72fdc81543f15a417c09687 (cherry picked from commit 2a31dd4025eff8d09ab207f31bacc0a5b8c36bd9) Reviewed-on: https://gerrit.libreoffice.org/1999 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-02-05Avoid a SAL_WARN caused by IllegalArgumentEx now being a RuntimeExStephan Bergmann
Change-Id: I6fad4e840cf47b4d41592ff179f66943a4469760 (cherry picked from commit 3d23c626e685f8ab3ee1780f10f368ee8ede61d0) Reviewed-on: https://gerrit.libreoffice.org/1997 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-01-27fdo#57061: Use a new MIGRATION4 flag file for profile migration LO 3 -> 4Stephan Bergmann
...to avoid missing migrations on Windows and Mac OS X, where existing "3" user profiles got the "MIGRATED" flag file erroneously added when running LO 3 already, presumably due to 6b522673373797bbf53d795d53e0ec45175a5d67 "default config location has changed, look in old config dir when migrating." (cherry picked from commit 67d23e3a99bbaaa5a4dff1f8f3a10bd8abd198fb) Conflicts: desktop/source/migration/migration.cxx Change-Id: I8dd50a36450c167d47411834cc06a754affadf6d Reviewed-on: https://gerrit.libreoffice.org/1867 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-01-21PRODUCTEXTENSION: fix various obvious strings and such...Michael Stahl
... to look pretty; most of these expect PRODUCTEXTENSION to be a word like "Beta" but nowadays it is ".micro.rc.alphabeta" numbers so there should be no space before it. ReplaceStringHookProc adds insult to injury by refusing to replace %ABOUTBOX variables unless some %PRODUCT is in the string. Change-Id: Ib676f3837ab0785529a226fc9359e8defacf3459 (cherry picked from commit c106167f5f6ec1bff9b2291ff8791ca6d4d411c3) Reviewed-on: https://gerrit.libreoffice.org/1763 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-01-10fdo#58909: Missing BAK_EXTENSIONS bootstrap variableStephan Bergmann
daeed90f4586eb9533041fb89bee163a5193596c "re-base on ALv2 code" had incorporated from <http://svn.apache.org/viewvc?view=revision&revision=1172102> "imported patch extensions_i117681.patch" the parts using BAK_EXTENSIONS in desktop/source/deployment/manager/, but not the parts setting BAK_EXTENSIONS in scp2/source/ooo/. Also, setting the stamp for "bak" in PackageManagerImpl::create needed to be adapted to bee742eb7a0d5dfe23e61d9ee49a29286de90256 "Fix sense of r/o detection code, and clean up" and 61eeb689d7605a23c3e71c652b57ee65cf5b28dc "fix smoketest - need to check read-only-ness of non-existent paths." (cherry picked from commit 8dd405d32cb331818dc8f9bd1af3c5a074100f0f) Conflicts: desktop/source/deployment/manager/dp_manager.cxx Change-Id: Ie73ce50b6c26bbee6f3b7230a4d163715180ef52 Reviewed-on: https://gerrit.libreoffice.org/1626 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-01-08Make LO buildable again after the GraphicFilter move.Jan Holesovsky
Conflicts: svtools/Library_svt.mk q# Change-Id: I3455a7294b136400f32163626d5a7a7f2bfa898c Signed-off-by: Cor Nouws <oolst@nouenoff.nl> Signed-off-by: Olivier Hallot <olivier.hallot@documentfoundation.org> Signed-off-by: Adolfo Jayme Barrientos <fitoschido@ubuntu.com> Signed-off-by: Michael Meeks <michael.meeks@suse.com>
2013-01-07fdo#57203 Unknown option: -EmbeddingAurimas Fišeras
Ignore this option on Windows. This work-arounds a regression introduced by f4a4ba9ac Windows appends -Embedding when LibreOffice is called by COM+ Before f4a4ba9ac this option was silently ignored. Change-Id: I8a727895c9ec8fa4b06aea8ad66b2791ada66dd5 Reviewed-on: https://gerrit.libreoffice.org/1514 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 3616640054f4fc18c6e7307ba17e7d89a0f5ae69) Conflicts: desktop/source/app/cmdlineargs.cxx
2012-12-19fdo#58331: Handle IllegalArgumentException routinely thrown for legacy extsStephan Bergmann
...that was no longer handled properly when installing such a legacy .zip extension due to 31170413ae3786bf44564e813d7291354e939a77 "API CHANGE: com.sun.star.lang.IllegalArgumentException." Change-Id: I6f5f4be0eed16496d8d3c3623d6676c7c669c5c4 (cherry picked from commit eaf3c60194e440e8a9bebac46f8d55ba6246001a)
2012-12-17Related fdo#33484: Terminate OfficeIPCThread by closing the accepting pipeStephan Bergmann
... (and setting mbDowning to indicate an error returned from accept() is due to termination) instead of setting up an extra pipe connection to send an "InternalIPC::TerminateThread" message (which allegedly caused deadlocks, see <https://gerrit.libreoffice.org/#/c/1311/> "Change Idf933915: office ipc: use timeout pipe feature when connecting to self"). Change-Id: Id302ca13112fc409685e7665b38f1030704a0ccf (cherry picked from commit 4ce2602befd59e69264d8e4ced8730b40c2b947c) Conflicts: desktop/source/app/officeipcthread.cxx desktop/source/app/officeipcthread.hxx
2012-12-13fdo#58060 use acor_und.dat and LANGUAGE_UNDETERMINEDEike Rathke
Previous versions used an empty language tag for LANGUAGE_DONTKNOW with the "[All]" autocorrection entry and read/wrote from/to arco_.dat file. An empty language tag otherwise is used for system locale and doesn't convert flawlessly with the new LanguageTag system. Instead use LANGUAGE_UNDETERMINED with the ISO 639 code 'und' so the file name is "acor_und.dat". During user profile migration an existing 3/user/autocorr/acor_.dat is copied to the new 4/user/autocorr/acor_und.dat Change-Id: I593f24829c6efd58f36e93ebd3385a3c925f7217 (cherry picked from commit 623410669fa2d5da9a2ce4e3c4b81ce23605a6df)
2012-12-13startup: more reliable startup of multiple instancesPierre-Eric Pelloux-Prayer
Until now, when a new soffice instance (S2) started and tried to connect to an existing soffice process (S1), S2 may have failed to boostrap due to race condition in communication over the shared pipe. S1 can be shutdown after S2 connected to it but _before_ S1 handled its arguments (code run after 'accept' method in OfficeIPCThread). This patch introduces a new message, sent by the main soffice after it has called accept if and only if it's not shutting down (see mbDowning member). The other soffice waits for this message before enabling going in PIPE_CONNECTED mode. If soffice fails to receive this message, pipe mode is left unchanged and after a quick pause, it will try again. Change-Id: I2e099a5804e1e8dd535cfd31ef454cffa44efa62 Signed-off-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 0dce7eae55bf90d2a7171a1fb8663d66ba4ac6d3)
2012-12-05Move flag file extensions/bundled/buildid -> extensions/buildidStephan Bergmann
...it does not only control bundled extensions. Change-Id: Idc4c9d3c6788fc77e90aa2478d50f2b0151a1238 (cherry picked from commit 40d413ee4c88d4c2b68e0c373c6657f000705285)
2012-12-05Remove hack for LO 3.6.x downgrading to preregistered bundled extensions againStephan Bergmann
With LO 4 using its own user profile, the problem of sharing a user profile between LO versions that do and do not use preregistration of bundled extensions can no longer happen, and so e9631f40ee49a244b6c6816e5cfb36814b9bafba "fdo#53006: And detect LO downgrading scenarios..." can be reverted again. Change-Id: I515077340823b8b277ffb6758b0d6a3cf8bfd0d5 (cherry picked from commit 0b4ba827060757ee0ce23030bc8e25b5ddb9581f)
2012-12-05Bye bye ODMATor Lillqvist
SUSE has no interest in it any longer, and I doubt anybody else has either.
2012-12-04Take extra cache/uno_packages/*.tmp_/*properties files into accountStephan Bergmann
...when migrating user extensions from an old user profile. Change-Id: I4425eba1e840bfdb33782bb3ed0542ce48b2f75f (cherry picked from commit bd9c4510ff13ab7e935ed12c5b6d1f132c6f2b79)
2012-12-02ensure lockfile doesn't leakCaolán McNamara
Change-Id: I6a4c7024da154104d985bca25b26a8243174ec8d
2012-12-02Remove unused method from desktopMarcos Paulo de Souza
Change-Id: I17b269c70bbf82aa5a4345d488777ac98d1d6938 Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/1221 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2012-11-30drop one more #include <rtl/locale.hxx>David Tardon
Change-Id: Ie01d49341ea1317153f4e57841a0a401a329140a
2012-11-30eradicate all traces of OLocale and rtl/locale.hxxMichael Stahl
... damn language tags breaking builds left and right ... Change-Id: I73224cb3fb2bb98779fdcace700cad2a4fb7cd0e
2012-11-30de-cargocult singleton creationBjoern Michaelsen
2012-11-30c++ API: use css alias in generated headers, adds global css declThorsten Behrens
This changes all generated API headers (.hpp and .hdl) to use a namespace alias 'css' instead of the pointlessly long com::sun::star Makes the change in cppumaker & associated tools, adds a global namespace alias definition in sal/types.h, and removes a kiloton of local, now pointless-to-harmful versions of that alias from all over the code. Change-Id: Ice5a644a6b971a981f01dc0589d48f5add31cc0f
2012-11-30fdo#46808, use service constructor for i18n::CollatorNoel Grandin
Change-Id: I15a360723e335345aad09e73fcb0f6815ed9e0d4
2012-11-30Remove SvtStartOptionsStephan Bergmann
...the single remaining user can use officecfg/Setup.hxx instead. Change-Id: Icc1b56d820a9fcd7ecc52e279bcdde3aac4499d4
2012-11-28We only support MSVC 2008 (_MSC_VER 1500) or laterTor Lillqvist
We can drop or simplify many conditionals. Change-Id: I37e820e515cc09845c30b62c89ddb3b6ff370f97
2012-11-28Remove useless method SetBackgroundBitmapMarcos Paulo de Souza
Thomas Arnhold asked me to take a look at the method SetBackgroundBitmap. In my XFCE, removing this method didn't chnage anything. So this needs more tests in Windows and other WM's. Change-Id: I3e10bea4eac114326ff981fb21ba0d292818b1da Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
2012-11-28fdo#46808, use service constructor for i18n::CollatorNoel Grandin
Change-Id: If6ad17fa9e274beff7ba872a095ced65438962af
2012-11-27String=>OUString in svl's inettype and fall-outNorbert Thiebaud
Change-Id: I7d64d117183738b86d1869ed629d73675de9c679
2012-11-27Desktop::GetDesktopResManager: handle language tagEike Rathke
Change-Id: Ica043b923e0918f65fb6b18c4205ba91784ef3c2
2012-11-27get rid of LanguageSelection::IsoStringToLocale() and use LanguageTagEike Rathke
Change-Id: Id327a4164435ee2e22980827ab21a5affdb8de9d
2012-11-26API CHANGE: com.sun.star.lang.IllegalArgumentExceptionMichael Stahl
... derives from com.sun.star.uno.RuntimeException instead of com.sun.star.uno.Exception. Only test that breaks with this change is jurt_uno/AnyConverter_Test, which for mysterious reasons effectively tests that IllegalArgumentException is a subclass of Exception and not RuntimeException. Presumably this is just a generic exception test that happens to use IllegalArgumentException. Some further testing indicates there are no problems expected at runtime: Running "make subsequentcheck" with all Java test code compiled against a ridl.jar that does not contain the change, running against a soffice that uses ridl.jar and rdbs with the change + ridl.jar with the change on the test side yields exactly the same AnyConverter_Test failure, with no other failures. Change-Id: Iad183de76ec7e0d56648084e97cdcc160b5b033d
2012-11-25Make XRestartmanager.requestRestart work from inside Desktop::ExecuteStephan Bergmann
Change-Id: I285f4ea088c08139593d0daad9a36a755985dec6
2012-11-25OfficeRestartManager clean-upStephan Bergmann
Change-Id: I21c6d9d2b23512e76cf46ebdbc765da780f8ec5c
2012-11-25Adapt to OUString-oriented SearchForwardStephan Bergmann
Change-Id: I0aec0bf6d2d3010292f5dee314074457c24ee408
2012-11-22AllSettings with LanguageTagEike Rathke
Change-Id: I710ae66e51139662eb442b681fdf9cc9d158551d
2012-11-22IPC_STATUS_2ND_OFFICE -> BS_TERMINATE -> EXIT_SUCCES rather than EXIT_FAILUREStephan Bergmann
Change-Id: Ic2dd861de07f90676bb263c7ea6c00c2b4335de5
2012-11-21remove OUSTR defineCaolán McNamara
Change-Id: I7b78fa23760af3641dcaf47bc90a995ae215404b
2012-11-21xslt dialog is supposed to be a modeless dialogCaolán McNamara
and fix the lifecycle to die at the right time Change-Id: Ibe8f683ed162500a93e02a56d8607bd2ee431ded
2012-11-20These should talk about "OpenOffice.org" after allStephan Bergmann
Change-Id: I43ddfad9a91484551763fd6e3a89f17382b7a392
2012-11-20Remove merge junkStephan Bergmann
Change-Id: I291baa1e78d0033d242b407f96f37cdbab9fe62b
2012-11-19Xcode says "'hash_set' file not found", and it seems unnecessary?Tor Lillqvist
Change-Id: I95ee1f5c04571c692e8e7ef7faa75fcae76eef93
2012-11-19re-base on ALv2 code. Includes:Michael Meeks
Patch contributed by: Jurgen Schmidt remove onlineregistration with dependencies http://svn.apache.org/viewvc?view=revision&revision=1240245 imported patch package_eventlistener.patch http://svn.apache.org/viewvc?view=revision&revision=1172103 Patch contributed by Pedro Giffuni Accept Google Chrome OS fonts as equivalent to MS fonts. http://svn.apache.org/viewvc?view=revision&revision=1233155 http://svn.apache.org/viewvc?view=revision&revision=1233408 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i114600#: remove forbidden characters from list of unencoded characters http://svn.apache.org/viewvc?view=revision&revision=1172370 Patches contributed by Oliver Rainer-Wittman some clean up in JPEGReader due to memory constraints http://svn.apache.org/viewvc?view=revision&revision=1299729 119114 - method <UpdateDialog::addSpecificError(..)> - create entry with correct type http://svn.apache.org/viewvc?view=revision&revision=1305265 Patches contributed by Ariel Constenla-Haile i118707 - make toolbar control's popup window grab focus http://svn.apache.org/viewvc?view=revision&revision=1225846 Patches contributed by Herbert Duerr #i118662# remove usage of BerkeleyDB in desktop module http://svn.apache.org/viewvc?view=revision&revision=1213171 minor cleanups in dp_persmap.* http://svn.apache.org/viewvc?view=revision&revision=1215064 flush early to prevent problem with extension manager not cleaning up its objects http://svn.apache.org/viewvc?view=revision&revision=1228147 i118726 do not flush *pmap file while reading it http://svn.apache.org/viewvc?view=revision&revision=1230614 #i119048# migrate BDB extension entries using a simple heuristic http://svn.apache.org/viewvc?view=revision&revision=1300972 #i119048# handle edge cases when importing BDB hash files http://svn.apache.org/viewvc?view=revision&revision=1301428 #i119113# fix of-by-one when importing BDB files http://svn.apache.org/viewvc?view=revision&revision=1305420 restore our encryption settings, icon themes, and dictionaries. removed wrapper hacks, kill obsolete bundled extension blob / pre-registration handling, remove duplicated quickstart code. remove OS/2 conditionals.
2012-11-19Revert "sb140: #i117084# do not leak Lockfile instance"Michael Meeks
This reverts commit 1d38dbab29245e430792f7b3a4c14c94cd011504. Conflicts: desktop/source/app/app.cxx
2012-11-19Revert "sb140: #i116910# do not leak Thread_Impl"Michael Meeks
This reverts commit e700031cc4f60f62d862940cd40de73e32f9104b.
2012-11-19fdo#57224: Fix logic of considering optional/ambiguous value as "disabled"Stephan Bergmann
...so that only a "not-registered" that is non-optional and non-ambiguous is considered as "disabled" by user's intention. Other combinations can occur for broken extensions (that will thus become disabled again anyway when we try to automatically enable them) and for originally enabled extensions for which cleanExtensionCache in desktop/source/app/app.cxx has forecefully removed user/uno_packages/cache/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc (and which should rather be kept enabled). Change-Id: Ic85b609ec9b3634cfa94a77151d42c07b9488030
2012-11-19Some clean-upStephan Bergmann
Change-Id: I02c56a86454b5ed6df29c3af60b3da2c7bd4b7e1
2012-11-19fdo#57224: Preserve disabled-state across reinstallDeployedExtensionsStephan Bergmann
Change-Id: I8d65b76fd93b63b51db88b7b09902ba64732dd97
2012-11-17drop old help ids not in use anymoreCaolán McNamara
Change-Id: I3acf29ac52a51e688fb41e2c978f458170cd9b12
2012-11-17use LanguageTagEike Rathke
Change-Id: I5e2a41eb94876302f61c261a350b6cf72db41a86
2012-11-15fdo#46808, use service constructor for ucb::SimpleFileAccessNoel Grandin
I upgraded the service to return XSimpleFileAccess3, since it already implemented that interface, and it's backwards compatible. Change-Id: I40001a46048bd21a23b6a2f58a95376f06fc634b
2012-11-14source file modes fixEnrico Weigelt, metux ITS
Change-Id: I8975f26f205ba33044285729da54e0210f872fcb Reviewed-on: https://gerrit.libreoffice.org/1065 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>