19c4d8d2fb
Many spelling fixes: directories h* - p*.
...
Attempt to clean up most but certainly not all the spelling
mistakes that found home in OpenOffice through decades. We
could probably blame the international nature of the code but
it is somewhat shameful that this wasn't done before.
(cherry picked from commit 11a1ff6144521aeabb0c6db25c89a2ac31bedee0)
Conflicts:
external/libxmlsec/xmlsec1-customkeymanage.patch
hwpfilter/source/hwpeq.cxx
icc/README
icu/createmak.pl
idl/source/objects/object.cxx
idlc/inc/idlc/errorhandler.hxx
include/jvmfwk/framework.h
include/oox/helper/propertyset.hxx
instsetoo_native/inc_ure/windows/msi_templates/_Validat.idt
javainstaller2/src/JavaSetup/org/openoffice/setup/Controller/PrologueCtrl.java
javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/SolarisInstaller.java
javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/LinuxHelper.java
javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/Controller.java
javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ExecuteProcess.java
javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java
javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java
jurt/com/sun/star/comp/servicemanager/ServiceManager.java
jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
jvmfwk/source/elements.cxx
jvmfwk/source/elements.hxx
l10ntools/inc/wtranode.hxx
l10ntools/inc/wtratree.hxx
l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java
l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java
l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java
l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java
l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
l10ntools/scripts/localize.pl
l10ntools/scripts/localize_old.pl
l10ntools/source/cfgmerge.cxx
l10ntools/source/export.cxx
l10ntools/source/filter/merge/FCFGMerge.java
l10ntools/source/filter/merge/Merger.java
l10ntools/source/filter/utils/Cache.java
l10ntools/source/filter/utils/ConfigHelper.java
l10ntools/source/filter/utils/FileHelper.java
l10ntools/source/filter/utils/XMLHelper.java
l10ntools/source/merge.cxx
l10ntools/source/tagtest.cxx
l10ntools/source/xmlparse.cxx
l10ntools/source/xrmmerge.cxx
libtextcat/libtextcat-2.2.patch
libxml2/libxml2-long-path.patch
linguistic/inc/linguistic/misc.hxx
linguistic/source/lngsvcmgr.cxx
migrationanalysis/src/driver_docs/allstrings.ulf
migrationanalysis/src/driver_docs/sources/AnalysisDriver.bas
migrationanalysis/src/driver_docs/sources/CommonMigrationAnalyser.bas
migrationanalysis/src/driver_docs/sources/word/MigrationAnalyser.cls
migrationanalysis/src/msokill/msokill.cpp
migrationanalysis/src/wizard/Wizard.frm
odk/examples/DevelopersGuide/Accessibility/EventHandler.java
odk/examples/DevelopersGuide/Accessibility/EventListenerProxy.java
odk/examples/DevelopersGuide/Accessibility/GraphicalDisplay.java
odk/examples/DevelopersGuide/Forms/DataAwareness.java
odk/examples/DevelopersGuide/Forms/KeyGenerator.java
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
odk/examples/cpp/complextoolbarcontrols/Makefile
odk/setsdkenv_windows.template
offapi/com/sun/star/accessibility/AccessibleEventId.idl
offapi/com/sun/star/accessibility/AccessibleEventObject.idl
offapi/com/sun/star/accessibility/AccessibleRelationType.idl
offapi/com/sun/star/accessibility/XAccessible.idl
offapi/com/sun/star/accessibility/XAccessibleRelationSet.idl
offapi/com/sun/star/accessibility/XAccessibleStateSet.idl
offapi/com/sun/star/animations/Event.idl
offapi/com/sun/star/animations/XAnimationNode.idl
offapi/com/sun/star/awt/AccessibleListBoxList.idl
offapi/com/sun/star/awt/XLayoutFlow.idl
offapi/com/sun/star/awt/XMessageBoxFactory.idl
offapi/com/sun/star/awt/XPopupMenu.idl
offapi/com/sun/star/awt/grid/XGridColumn.idl
offapi/com/sun/star/chart/ChartAxis.idl
offapi/com/sun/star/chart2/data/TabularDataProviderArguments.idl
offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
offapi/com/sun/star/configuration/AdministrationProvider.idl
offapi/com/sun/star/configuration/ConfigurationRegistry.idl
offapi/com/sun/star/configuration/backend/XBackendChangesNotifier.idl
offapi/com/sun/star/datatransfer/XDataFormatTranslator.idl
offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
offapi/com/sun/star/deployment/InvalidRemovedParameterException.idl
offapi/com/sun/star/document/DocumentInfo.idl
offapi/com/sun/star/document/EmptyUndoStackException.idl
offapi/com/sun/star/document/EventObject.idl
offapi/com/sun/star/document/ExtendedTypeDetection.idl
offapi/com/sun/star/document/ExtendedTypeDetectionFactory.idl
offapi/com/sun/star/document/FilterFactory.idl
offapi/com/sun/star/document/MediaDescriptor.idl
offapi/com/sun/star/document/NoSuchFilterRequest.idl
offapi/com/sun/star/document/OfficeDocument.idl
offapi/com/sun/star/document/TypeDetection.idl
offapi/com/sun/star/document/UndoContextNotClosedException.idl
offapi/com/sun/star/document/XExtendedFilterDetection.idl
offapi/com/sun/star/document/XFilter.idl
offapi/com/sun/star/document/XInteractionFilterSelect.idl
offapi/com/sun/star/document/XTypeDetection.idl
offapi/com/sun/star/drawing/Hatch.idl
offapi/com/sun/star/drawing/XDrawPages.idl
offapi/com/sun/star/drawing/XShapeBinder.idl
offapi/com/sun/star/drawing/framework/XConfigurationControllerRequestQueue.idl
offapi/com/sun/star/drawing/framework/XRelocatableResource.idl
offapi/com/sun/star/embed/ElementModes.idl
offapi/com/sun/star/embed/EntryInitModes.idl
offapi/com/sun/star/embed/Storage.idl
offapi/com/sun/star/embed/StorageFactory.idl
offapi/com/sun/star/embed/StorageStream.idl
offapi/com/sun/star/embed/XCommonEmbedPersist.idl
offapi/com/sun/star/embed/XEmbedObjectClipboardCreator.idl
offapi/com/sun/star/embed/XEmbeddedClient.idl
offapi/com/sun/star/embed/XInplaceClient.idl
offapi/com/sun/star/embed/XInplaceObject.idl
offapi/com/sun/star/embed/XInsertObjectDialog.idl
offapi/com/sun/star/embed/XPersistanceHolder.idl
offapi/com/sun/star/embed/XStorage.idl
offapi/com/sun/star/embed/XTransactionBroadcaster.idl
offapi/com/sun/star/embed/XTransactionListener.idl
offapi/com/sun/star/form/FormComponents.idl
offapi/com/sun/star/form/XSubmitListener.idl
offapi/com/sun/star/form/binding/BindableDataAwareControlModel.idl
offapi/com/sun/star/form/binding/BindableDatabaseListBox.idl
offapi/com/sun/star/form/component/DatabaseComboBox.idl
offapi/com/sun/star/form/component/DatabaseFormattedField.idl
offapi/com/sun/star/form/component/DatabasePatternField.idl
offapi/com/sun/star/form/component/DatabaseTextField.idl
offapi/com/sun/star/form/component/GridControl.idl
offapi/com/sun/star/frame/Components.idl
offapi/com/sun/star/frame/ContentHandler.idl
offapi/com/sun/star/frame/ContentHandlerFactory.idl
offapi/com/sun/star/frame/Desktop.idl
offapi/com/sun/star/frame/DispatchDescriptor.idl
offapi/com/sun/star/frame/DispatchProvider.idl
offapi/com/sun/star/frame/DispatchRecorder.idl
offapi/com/sun/star/frame/Frame.idl
offapi/com/sun/star/frame/FrameActionEvent.idl
offapi/com/sun/star/frame/FrameLoaderFactory.idl
offapi/com/sun/star/frame/ProtocolHandler.idl
offapi/com/sun/star/frame/XControlNotificationListener.idl
offapi/com/sun/star/frame/XDesktop.idl
offapi/com/sun/star/frame/XDispatchRecorderSupplier.idl
offapi/com/sun/star/frame/XDocumentTemplates.idl
offapi/com/sun/star/frame/XFrame.idl
offapi/com/sun/star/frame/XFrameLoader.idl
offapi/com/sun/star/frame/XInterceptorInfo.idl
offapi/com/sun/star/frame/XRecordableDispatch.idl
offapi/com/sun/star/frame/XStatusbarController.idl
offapi/com/sun/star/frame/XStorable2.idl
offapi/com/sun/star/frame/XSynchronousDispatch.idl
offapi/com/sun/star/frame/XTerminateListener2.idl
offapi/com/sun/star/graphic/GraphicObject.idl
offapi/com/sun/star/graphic/XGraphicObject.idl
offapi/com/sun/star/inspection/XNumericControl.idl
offapi/com/sun/star/inspection/XObjectInspectorModel.idl
offapi/com/sun/star/inspection/XPropertyHandler.idl
offapi/com/sun/star/installation/XProtocolHandlerCheck.idl
offapi/com/sun/star/installation/protocols.idl
offapi/com/sun/star/linguistic2/SpellFailure.idl
offapi/com/sun/star/linguistic2/XLinguServiceManager.idl
offapi/com/sun/star/mail/XMailServer.idl
offapi/com/sun/star/mozilla/XPluginInstance.idl
offapi/com/sun/star/mozilla/XPluginInstanceSyncPeer.idl
offapi/com/sun/star/packages/zip/ZipIOException.idl
offapi/com/sun/star/presentation/OutlineView.idl
offapi/com/sun/star/presentation/XPresentation2.idl
offapi/com/sun/star/presentation/XSlideShow.idl
offapi/com/sun/star/presentation/XSlideShowController.idl
offapi/com/sun/star/report/XFunction.idl
offapi/com/sun/star/report/XFunctionsSupplier.idl
offapi/com/sun/star/report/XReportComponent.idl
offapi/com/sun/star/report/XReportDefinition.idl
offapi/com/sun/star/report/meta/XFunctionManager.idl
offapi/com/sun/star/resource/XStringResourcePersistence.idl
offapi/com/sun/star/resource/XStringResourceWithLocation.idl
offapi/com/sun/star/resource/XStringResourceWithStorage.idl
offapi/com/sun/star/sdb/DataSettings.idl
offapi/com/sun/star/sdb/ErrorCondition.idl
offapi/com/sun/star/sdb/SQLContext.idl
offapi/com/sun/star/sdb/Table.idl
offapi/com/sun/star/sdb/XRowSetApproveListener.idl
offapi/com/sun/star/sdb/application/XDatabaseDocumentUI.idl
offapi/com/sun/star/sdb/tools/XConnectionTools.idl
offapi/com/sun/star/sdbc/DataType.idl
offapi/com/sun/star/sdbc/XDatabaseMetaData.idl
offapi/com/sun/star/sdbcx/Descriptor.idl
offapi/com/sun/star/security/DocumentSignatureInformation.idl
offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl
offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl
offapi/com/sun/star/sheet/DatabaseRange.idl
offapi/com/sun/star/smarttags/XSmartTagAction.idl
offapi/com/sun/star/table/AccessibleTableView.idl
offapi/com/sun/star/table/CellProperties.idl
offapi/com/sun/star/table/CellRangeListSource.idl
offapi/com/sun/star/table/CellValueBinding.idl
offapi/com/sun/star/table/XMergeableCellRange.idl
offapi/com/sun/star/task/DocumentPasswordRequest.idl
offapi/com/sun/star/task/JobExecutor.idl
offapi/com/sun/star/task/MasterPasswordRequest.idl
offapi/com/sun/star/task/PasswordRequest.idl
offapi/com/sun/star/task/XJob.idl
offapi/com/sun/star/text/AccessiblePageView.idl
offapi/com/sun/star/text/AccessibleTextDocumentView.idl
offapi/com/sun/star/text/LineNumberingProperties.idl
offapi/com/sun/star/text/NumberingRules.idl
offapi/com/sun/star/text/XRelativeTextContentRemove.idl
offapi/com/sun/star/text/textfield/Database.idl
offapi/com/sun/star/text/textfield/SetExpression.idl
offapi/com/sun/star/text/textfield/docinfo/Description.idl
offapi/com/sun/star/text/textfield/docinfo/Info0.idl
offapi/com/sun/star/text/textfield/docinfo/Info1.idl
offapi/com/sun/star/text/textfield/docinfo/Info2.idl
offapi/com/sun/star/text/textfield/docinfo/Info3.idl
offapi/com/sun/star/text/textfield/docinfo/Keywords.idl
offapi/com/sun/star/text/textfield/docinfo/Revision.idl
offapi/com/sun/star/text/textfield/docinfo/Subject.idl
offapi/com/sun/star/text/textfield/docinfo/Title.idl
offapi/com/sun/star/ucb/CommandFailedException.idl
offapi/com/sun/star/ucb/Content.idl
offapi/com/sun/star/ucb/ContentAction.idl
offapi/com/sun/star/ucb/FetchError.idl
offapi/com/sun/star/ucb/FetchResult.idl
offapi/com/sun/star/ucb/HierarchyDataSource.idl
offapi/com/sun/star/ucb/InteractiveFileIOException.idl
offapi/com/sun/star/ucb/SearchRecursion.idl
offapi/com/sun/star/ucb/UniversalContentBroker.idl
offapi/com/sun/star/ucb/XAnyCompare.idl
offapi/com/sun/star/ucb/XCachedContentResultSetFactory.idl
offapi/com/sun/star/ucb/XCachedDynamicResultSetFactory.idl
offapi/com/sun/star/ucb/XContentIdentifierMapping.idl
offapi/com/sun/star/ui/UIElementType.idl
offapi/com/sun/star/ui/dialogs/FilePicker.idl
offapi/com/sun/star/ui/dialogs/FolderPicker.idl
offapi/com/sun/star/util/PathSubstitution.idl
offapi/com/sun/star/util/XChangesNotifier.idl
offapi/com/sun/star/util/XCloseBroadcaster.idl
offapi/com/sun/star/util/XCloseListener.idl
offapi/com/sun/star/util/XCloseable.idl
offapi/com/sun/star/util/XStringSubstitution.idl
offapi/com/sun/star/util/XTextSearch.idl
offapi/com/sun/star/util/XURLTransformer.idl
offapi/com/sun/star/xforms/XModel.idl
offapi/com/sun/star/xml/sax/XFastAttributeList.idl
offapi/com/sun/star/xml/sax/XFastParser.idl
officecfg/registry/data/org/openoffice/Office/Labels.xcu
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
officecfg/registry/schema/org/openoffice/Office/Common.xcs
officecfg/registry/schema/org/openoffice/Office/Embedding.xcs
officecfg/registry/schema/org/openoffice/Office/ExtensionDependencies.xcs
officecfg/registry/schema/org/openoffice/Office/ExtensionManager.xcs
officecfg/registry/schema/org/openoffice/Office/Histories.xcs
officecfg/registry/schema/org/openoffice/Office/OptionsDialog.xcs
officecfg/registry/schema/org/openoffice/Office/Paths.xcs
officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
officecfg/registry/schema/org/openoffice/Office/TabBrowse.xcs
officecfg/registry/schema/org/openoffice/Office/UI.xcs
officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs
officecfg/registry/schema/org/openoffice/Office/UI/WindowState.xcs
officecfg/registry/schema/org/openoffice/Office/WebWizard.xcs
officecfg/registry/schema/org/openoffice/Office/Writer.xcs
officecfg/registry/schema/org/openoffice/Setup.xcs
officecfg/registry/schema/org/openoffice/TypeDetection/Types.xcs
oox/source/xls/sheetdatabuffer.cxx
package/source/xstor/xstorage.cxx
padmin/source/padialog.src
postprocess/signing/signing.pl
pyuno/source/module/pyuno_module.cxx
Change-Id: I60c7b6d661ff803b5e9214ac7fefb32772ef19a7
2014-04-30 17:11:30 +01:00
69eebf8735
fdo76591:-Textbox property (order-> send behind text) is not preserved.
...
Z-Index was not handledin LO for vml.
I have made the changes to handle that using aGrabBag.
Change-Id: I2af3b2974c8eb699bc6a7b743dc438584d6517ac
Reviewed-on: https://gerrit.libreoffice.org/8833
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk >
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk >
2014-04-08 03:20:50 -05:00
f3802139ac
oox: sal_Bool->bool
...
Change-Id: Ia05b3210314c39db5110eded731f2be4b7405e87
2014-04-03 09:17:51 +02:00
567ef6d578
Second batch of adding SAL_OVERRIDE to overriding function declarations
...
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
2014-03-27 18:12:18 +01:00
c66229bfa4
oox: prefer passing OUString by reference
...
Change-Id: Iace276878e7ae668bba5bb6e36af1e5d5d72d6cb
2014-03-17 09:00:08 +02:00
8792ec7b21
Remove visual noise from include
...
Conflicts:
include/framework/preventduplicateinteraction.hxx
include/sfx2/sfxbasecontroller.hxx
include/sfx2/sfxbasemodel.hxx
include/toolkit/awt/vclxtabpagemodel.hxx
include/vcl/field.hxx
include/vcl/settings.hxx
Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com >
Tested-by: Caolán McNamara <caolanm@redhat.com >
2014-03-01 09:51:32 -06:00
5e21a413c7
cppuhelper: retrofit std::exception into overriding exception specs
...
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
2014-02-26 18:22:20 +01:00
c4ff46485f
fdo#65833 Fix to preserve VML Canvas Information
...
Grab-bagged the "editas" attribute of v:group and added UT for
the same
Please verify this fix on MS Office 2007 as it renders the mc:Fallback VML part
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7335
Change-Id: I4e4456997621089967514009005ee775b71d6d69
2014-01-13 17:48:18 +01:00
940a2944b0
fdo#65108 inter-module includes <>
...
Change-Id: Ie672de68f6a87713a379e794fa3ad255ad52a71e
2013-11-09 18:48:38 -06:00
10d0526d72
fixincludeguards.sh: include/o*
...
Change-Id: Ibd5d8af00f6582d53231c76e2b04e737b5804497
2013-10-23 23:22:30 +02:00
8738ded7bb
fdo#69636 VML import: handle mso-layout-flow-alt shape prop for sw frames
...
Writer core doesn't support this, and this has been a problem for table
cells as well. There the workaround we're using for quite a while is to
do the rotation at a text portion level instead, which results in
reasonable layout for simple cases. Do the same here.
One additional complexity is that the API between oox and writerfilter
is a single UNO shape, we get this property in oox, and we have to
handle it in writerfilter, when the text frame is already attached to
some text. Kill this problem by adding a FrameInteropGrabBag for sw text
frames: it's useful anyway, and then we can pass around this property
inside the grab bag.
Change-Id: Idb5ec83b5cbdde8f29d15b2cebfad24226bb6507
2013-09-26 12:43:32 +02:00
3af7e5c320
Exorcise some cargo-cultness in oox.
...
- the inline keyword on class methods that have their body defined
right there in the class definition is redundant
- the explicit keyword on nullary ctors is pointless, there is no
implicit conversion happening anyway with those
Change-Id: Ie9f44c7948f932ce3a8af871bf73743112d94d03
2013-09-11 18:20:37 +02:00
4cbc41bc4e
bnc#779642 VML import: handle drawinglayer rectangle char spacing
...
Change-Id: I79fa72c9235682030d23a03fdb0c7c40370c4a8a
2013-09-06 18:39:00 +02:00
eeae7bf241
VML import of mso-wrap-distance-{left,right,top,bottom}
...
Change-Id: Ib16be0bf83120ed7aeb01f29634d51421fc351c8
2013-08-16 19:53:31 +02:00
2bc574599b
more SAL_OVERRIDE
...
Change-Id: I7b3e908a0ce00f0d844803fdf628d3d757de92bd
2013-07-02 11:55:44 +02:00
5a737fca37
fdo#46361 oox: handle w:jc for groupshape textboxes
...
Change-Id: I21391d9a9f5b5173b599006287b33fdaab3c0c75
2013-07-02 11:55:43 +02:00
6bf79576ae
fdo#46361 oox: VML import of v-text-anchor for drawinglayer shapes
...
Change-Id: Ib73d17fd8c9325f7f062d4a15b655e36b84bd351
2013-07-02 11:55:42 +02:00
f24e4c74d7
fdo#46361 oox: handle multiple w:p for groupshape textboxes
...
One testcase had to be adjusted, as it seems previously we stripped all
newlines at the end (I consider that as a bug), and now we only strip
the last one (so the resulting number of paragraphs on the shape and in
the source document equal).
Change-Id: Ic22b96c2992b53c72e2609e2286622173b86065c
2013-07-02 11:55:42 +02:00
717aafb9ca
robustify some headers
...
Change-Id: Id1998b240025973f43691e83cebce17449b060ba
2013-06-30 14:52:30 +02:00
290695c785
bnc#817956 VML import of v:textpath
...
Word exposes this as Watermark in its UI.
Change-Id: I23d9b2aab2dab60a98c7f456b0592c2b74bcaf81
2013-05-29 15:56:50 +02:00
b399c1a38c
n#592908: docx import, fixed handling of w10:wrap
...
commit f837c4288cdae4921b3fb6747ba2e2cd5ce2dcd2 moved the handling of
w10:wrap tag in oox, but thus no wrapping was imported any more.
The fix consists in letting the w10:wrap element be handled by writerfilter's
dmapper if the shape has already been retrieved from oox (which is the
case for textboxes). In other cases, make sure that we don't set the
Surround property once again in writerfilter as that would override what
has been done in oox.
(cherry picked from commit 51d5e90b7c09cb980bc72a2c6b1a65303ef15ea2)
Conflicts:
oox/inc/oox/vml/vmlshape.hxx
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I8ab158641afcf6b9945c52238e7f5adb9e8b3adf
2013-04-30 09:34:28 +02:00
b9337e22ce
execute move of global headers
...
see https://gerrit.libreoffice.org/#/c/3367/
and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details
Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
2013-04-23 22:20:31 +02:00
