Age | Commit message (Collapse) | Author | Files | Lines |
|
Change-Id: I7f79aff38899fd814d707b40f3fd77b2c87b1328
|
|
And get rid of the no longer needed hack.
Change-Id: I275cbf212a6e6d3d28d136be9736dd1ac03a66ef
|
|
RTFSdrImport::resolve() already had the logic to use the relevant API
depending on if the shape is a text frame or not -- extract that to a
separate member function and use it from RTFDocumentImpl::popState(),
too.
Change-Id: I663b372244f09f002447ece62587143b2a575795
|
|
Change-Id: Iac7e3a14753ee0e0c6d64bda270043462fa3f20a
Reviewed-on: https://gerrit.libreoffice.org/15698
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org>
|
|
This attributes needs a value from the enumeration.
See http://dev-builds.libreoffice.org/crashtest/6183a945de03dcd5fe0b967d5814a0add954a8c8/validation/docx/fdo43632-1.docx.log :
(word/document.xml:2 col:70,187) cvc-enumeration-valid: Value '' is not facet-valid with respect to enumeration
'[inline, top, center, bottom, inside, outside]'. It must be a value from the enumeration.
(word/document.xml:2 col:70,187) cvc-attribute.3: The value '' of attribute 'w:tblpYSpec' on element 'w:tblpPr'
is not valid with respect to its type, 'ST_YAlign'.
Change-Id: Ibe4ccdf1c273e2ede22dc8865ec91af4de162e10
Reviewed-on: https://gerrit.libreoffice.org/15693
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Joren De Cuyper <jorendc@libreoffice.org>
|
|
Change-Id: I8a6abc563fa80a801d1907100d0b1138d260c36e
|
|
See validation log of fdo73214:
ERROR cvc-complex-type.3.2.2: Attribute 'type' is not allowed to appear in element 'v:imagedata'.
ERROR cvc-complex-type.3.2.2: Attribute 'color2' is not allowed to appear in element 'v:imagedata'.
http://dev-builds.libreoffice.org/crashtest/d879d5346b525c478e93363b7ec06e797ce01461/validation/docx/fdo73214-1.docx.log
Change-Id: I99eacc05ed28c3cd848326fd08f3668a1ce0f4fb
Reviewed-on: https://gerrit.libreoffice.org/15668
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: I98a0fecf15337db729b39b80aa9c664abcdd3daa
|
|
Change-Id: Ie8a7bc9800ed0122092f88cedadb126b7891f2a6
Reviewed-on: https://gerrit.libreoffice.org/15655
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Id268393bf28a6edb4a481d7a74ae412b337b3fc8
|
|
remove the DIALOG_NO_PARENT abomination and replace it with a flags
parameter
Change-Id: I71b7dc46c619f2db56af6d4dc2c17daf0a2c8534
Reviewed-on: https://gerrit.libreoffice.org/15645
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
|
|
Change-Id: I5d02ba0db00e11af3c17eaf77ce19c635a52077f
|
|
Change-Id: I3e78e3104af97eed91c102e9ca5546e0785c5f8c
|
|
Converted existing method that provides application name and version in two functions
Change-Id: I93b70da7c78ee5db3d6eb710a2a2a9f4b7b4fb86
Reviewed-on: https://gerrit.libreoffice.org/15151
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
_DelBookmarks() will actually delete marks that exactly match both start
and end position of the range, so restrict the call to only the
fully-deleted nodes that will be moved to the Undo-array.
(regression from 370febbf19a5f362394d1c9e69b12dcb218f6501)
Change-Id: Icf5097774aa55ee152a1e20c0c7264330955c615
|
|
Problem Description :
The xlsx file has the extended document property <TotalTime>#n</TotalTime> in /docProps/app.xml
LibreOffice appears to read this as a a total editing time of in second_ but according to ECMA-376 2nd edition:
22.2.2.27 TotalTime (Total Edit Time Metadata Element)
Total time that a document has been edited.
The default time unit is minutes.
(ECMA-376 1st edition has the same statement in 7.2.2.27)
XML difference: None
After RT : None
Solution :
As LO uses the TotalTime in seconds, while importing the TotalTime,
the TotalTime mentioned in the app.xml [which is in minutes] converted it to seconds.
TODO: Writing a UT seems to be tricky for this change.
Need to analyze and will raise the UT in separate CL.
Change-Id: Icbe998b9881ac241a9147628573bab6ef63582c4
Reviewed-on: https://gerrit.libreoffice.org/15479
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
In case of 'no fill' for vml textboxes, MS office rendered as
transpanrent textbox.
When opened same file on LO, it rendered it as textframe with white
background. (Even if the fillstyle is type of 'no fill' and 'backcolortransparency
' is 100%)
So, Fixing this issue by applying 100% 'FillTransparency' if it gets above situation.
Change-Id: Ied2d3855354ada994288c29c78d9ccb4e5b0b4d6
Reviewed-on: https://gerrit.libreoffice.org/15390
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
These were added by commit cfc4650c8594334edecc3b50ca54461f6bee2d43
(Added some teaks to 'model.xml', 2014-09-16), but the matching dmapper
part is missing, so they aren't useful in practice, and cause a crash on
import of crashtest's File_953.docx.
Change-Id: I3d1c138534a37dc9ba500f1134ca4bb9ebae0e96
|
|
Resolve several thousand lines of conflicts.
Conflicts:
accessibility/source/extended/accessiblelistbox.cxx
accessibility/source/standard/vclxaccessiblecombobox.cxx
accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
accessibility/source/standard/vclxaccessiblelistbox.cxx
accessibility/source/standard/vclxaccessibletextfield.cxx
basctl/source/basicide/basidesh.cxx
cui/source/inc/chardlg.hxx
cui/source/tabpages/tpbitmap.cxx
dbaccess/source/ui/dlg/UserAdmin.cxx
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
extensions/source/propctrlr/propertyeditor.hxx
extensions/source/scanner/sanedlg.cxx
filter/source/pdf/impdialog.cxx
include/sfx2/mgetempl.hxx
include/sfx2/sidebar/SidebarToolBox.hxx
include/sfx2/viewsh.hxx
include/svtools/brwbox.hxx
include/svtools/filectrl.hxx
include/svtools/scrwin.hxx
include/svx/dlgctrl.hxx
include/svx/sidebar/Popup.hxx
include/svx/sidebar/PopupContainer.hxx
include/svx/sidebar/PopupControl.hxx
include/svx/sidebar/SidebarDialControl.hxx
include/svx/sidebar/ValueSetWithTextControl.hxx
sc/source/ui/condformat/condformatdlgentry.cxx
sc/source/ui/navipi/navipi.cxx
sc/source/ui/sidebar/CellBorderStyleControl.hxx
sd/source/ui/animations/CustomAnimationDialog.cxx
sd/source/ui/inc/DrawViewShell.hxx
sd/source/ui/inc/Ruler.hxx
sd/source/ui/inc/SlideSorter.hxx
sd/source/ui/inc/ViewTabBar.hxx
sd/source/ui/inc/Window.hxx
sd/source/ui/inc/morphdlg.hxx
sd/source/ui/inc/sdpreslt.hxx
sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
sd/source/ui/sidebar/LayoutMenu.hxx
sd/source/ui/sidebar/MasterPagesSelector.hxx
sd/source/ui/sidebar/NavigatorWrapper.hxx
sd/source/ui/sidebar/PanelBase.hxx
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
sd/source/ui/slideshow/showwindow.hxx
sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
sd/source/ui/view/ViewShellBase.cxx
sd/source/ui/view/drviewsa.cxx
sfx2/source/appl/fileobj.hxx
sfx2/source/appl/opengrf.cxx
sfx2/source/control/thumbnailviewacc.hxx
sfx2/source/dialog/securitypage.cxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/doc/docinsert.cxx
sfx2/source/doc/guisaveas.cxx
sfx2/source/inc/alienwarn.hxx
sfx2/source/sidebar/Deck.cxx
sfx2/source/sidebar/Deck.hxx
sfx2/source/sidebar/DeckTitleBar.cxx
sfx2/source/sidebar/DeckTitleBar.hxx
sfx2/source/sidebar/MenuButton.cxx
sfx2/source/sidebar/MenuButton.hxx
sfx2/source/sidebar/Panel.cxx
sfx2/source/sidebar/Panel.hxx
sfx2/source/sidebar/PanelTitleBar.hxx
sfx2/source/sidebar/SidebarDockingWindow.hxx
sfx2/source/sidebar/SidebarToolBox.cxx
sfx2/source/sidebar/TabBar.hxx
sfx2/source/sidebar/TabItem.cxx
sfx2/source/sidebar/TabItem.hxx
sfx2/source/sidebar/TitleBar.hxx
sfx2/source/toolbox/imgmgr.cxx
starmath/inc/edit.hxx
starmath/inc/smmod.hxx
starmath/qa/cppunit/test_starmath.cxx
starmath/source/edit.cxx
starmath/source/smmod.cxx
svtools/source/brwbox/brwbox1.cxx
svtools/source/brwbox/datwin.hxx
svtools/source/contnr/fileview.cxx
svtools/source/contnr/simptabl.cxx
svtools/source/control/filectrl.cxx
svtools/source/control/valueimp.hxx
svx/inc/GalleryControl.hxx
svx/source/dialog/dlgctrl.cxx
svx/source/dialog/swframeexample.cxx
svx/source/fmcomp/fmgridif.cxx
svx/source/gallery2/GalleryControl.cxx
svx/source/sidebar/EmptyPanel.hxx
svx/source/sidebar/area/AreaPropertyPanel.hxx
svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
svx/source/sidebar/insert/InsertPropertyPanel.cxx
svx/source/sidebar/insert/InsertPropertyPanel.hxx
svx/source/sidebar/line/LinePropertyPanel.hxx
svx/source/sidebar/line/LineWidthControl.cxx
svx/source/sidebar/line/LineWidthControl.hxx
svx/source/sidebar/line/LineWidthValueSet.hxx
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
svx/source/sidebar/possize/SidebarDialControl.cxx
svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
svx/source/sidebar/text/TextPropertyPanel.hxx
svx/source/sidebar/tools/PopupContainer.cxx
svx/source/sidebar/tools/PopupControl.cxx
svx/source/sidebar/tools/ValueSetWithTextControl.cxx
svx/source/svdraw/svdfmtf.hxx
svx/source/svdraw/svdibrow.cxx
svx/source/tbxctrls/colrctrl.cxx
svx/source/tbxctrls/tbcontrl.cxx
sw/source/ui/dbui/mmaddressblockpage.cxx
sw/source/ui/dialog/uiregionsw.cxx
sw/source/ui/index/cnttab.cxx
sw/source/uibase/inc/drpcps.hxx
sw/source/uibase/sidebar/PageColumnControl.hxx
sw/source/uibase/sidebar/PageMarginControl.hxx
sw/source/uibase/sidebar/PageOrientationControl.hxx
sw/source/uibase/sidebar/PagePropertyPanel.hxx
sw/source/uibase/sidebar/PageSizeControl.hxx
sw/source/uibase/uiview/view2.cxx
sw/source/uibase/utlui/navipi.cxx
vcl/inc/svdata.hxx
vcl/source/control/combobox.cxx
vcl/source/control/lstbox.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/winproc.cxx
Change-Id: I056cf3026ff17d65cca0b6e6588bda4a88fa8d95
|
|
Change-Id: I8af572c43542c384718c8f9c75749d2f3cb35cac
|
|
Change-Id: I193099d7fffc160f0198e3d42d5d6fd5835c79cf
|
|
Change-Id: I9dfde74fa7e5e3a651ea014e6cc335bac780cb4b
|
|
Commit fe444d1f74abe417962be0bcd3340f40f2446b58 (fdo#62536: sw: fix
AutoCorrect bold/underline on existing AUTOFMT, 2013-06-20) adds an
empty inet format hint on the text node during autocorrection, on export
we can safely ignore that to provide well-formed output.
Change-Id: Iafae941a13e29dcc7d8b4bade5ce94a486b59638
|
|
Change-Id: Ibd171fda4ea38de4d76d8f252d6f6d37cf3b9a66
Reviewed-on: https://gerrit.libreoffice.org/15158
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Commit e789c7f0f15a6b571de95b81e77e3a323e9f540e (RTF import of
d{x,y}WrapDist* shape properties, 2013-04-09) added support for wrap
distance of shapes, but that was ignored for shapes, as dmapper later
overwrote the set margins.
Fix this by generating the expected tokens in case of pictures, then
dmapper will take care of the rest.
Also add testcases for the original shape wrap distance feature that was
missing.
Change-Id: I6f219ee6fef71328368409d142897dbae77a0f2f
|
|
Checks that header is exported to DOCX when section is first
paragraph.
Change-Id: Ie8db2a372754208203f0df62137a3a0c3bbf39b9
Reviewed-on: https://gerrit.libreoffice.org/15370
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
this time the missing cells are on the left
Change-Id: I55a5aa60c8d06b25b0c48b3f6a683694adca8e6a
|
|
Regression from commit 1f77a5e8d5bf8a7f1b7bd7206996d2b2efc59462
(n#203704 fix RTF export table output for subtables, 2012-02-08), the
problem is that RtfAttributeOutput::StartTableRow() has two callers
depending on if it's the first or a later row, but the m_bTableRowEnded
flag storing if that method is called is only set in one case.
Fix the problem by moving the update of the flag to the method itself.
Change-Id: Ieae1fb53f9528fc74d037d2fd783b3979b17cab8
|
|
Previously SvxHyphenZoneItem was serialized to some custom RTF extension
that even our own RTF import ignores since LO 3.5.
Change-Id: Ia99d9750ad0b1a07105eeef2bee07e6fdbfe7876
|
|
Change-Id: I727f0bcee5c506fd524ff1b1b6f9de5f012bed20
|
|
Change-Id: Ia53d7a2aba039386cafcf8d0030c9e768c08b743
|
|
Change-Id: I2b23d406463168f010c8f2d48889a5a0ff15895c
|
|
old school complex tables can create a table model
where a cell exists in the table but there are no
paragraphs in it.
--------
| A | C |
----
| B |*D*|
--------
i.e. normally for the above there are 4 nodes which
get exported, even though C and D are merged. But it
can be the case that there are only three nodes, and
*D* is missing
be conservative for now and only do this for the
obviously broken no cell start but cell end case
and incrementally build up the test-cases
Change-Id: I5703595f61688a66b7fac7f3905ace0c207c9875
|
|
Change-Id: Ide8cb5f45d3eb60c45d86d58a9ab12bbc9f4cf47
|
|
Commit 558d5c25a0b1d6a937d33291a4b6cd7fca6cb15b (implement RTF_LTRPAR
and RTF_RTLPAR, 2011-06-09) was just a guess, this one is the proper
mapping.
Change-Id: I1156ef5ddc34264d761d3e64dd0537bc6ec0ced7
|
|
Change-Id: I5be3980ac865162d8d7626556ca47eca4b0ee433
Reviewed-on: https://gerrit.libreoffice.org/15344
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
|
|
There were two problems here:
1) The input stream is read multiple times, so plain naive XInputStream
is not enough, XSeekable is needed, as it is the case for the stream
provided by the OOXML tokenizer.
2) Seeking to the correct start position is not enough, code using the
stream will assume that seeking to the beginning of the stream allows
reading the correct data again, so provide a dedicated stream instead.
With this, handling of math equations created by Word <= 2007 and
embedded to RTF files can be edited finally.
Change-Id: Ic225e1e1060f8bdd5651a21e68970620c9ac6b68
|
|
With this, math equations created by Word <= 2003 and embedded to docx
files can be edited finally. Previously the result was read-only and
opened in an unexpected new window.
Change-Id: I4f9dd1cca4a149959f6151cf9af9242b53190ef5
|
|
The bugdoc has:
<style:page-layout-properties fo:background-color="#007f7f" >
<style:background-image
xlink:href="Pictures/2000003900002FA3000055F455EC9F63.svm"/>
</style:page-layout-properties>
In this case it's clearly better to prefer the Graphics.
The old code could actually store both in the model but the UI only
allows setting either Color or Graphic, so this should be good enough.
(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)
Change-Id: Id33231ad90815d9791f90289fb0b55455d334c14
|
|
Add the fill style properties so background images etc. are not lost.
(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)
Change-Id: I517350eec2f32e4b4bb80427666aad23a31d666a
|
|
Change-Id: I7e5f28f6cc8010ac233d58cfa6a2158e3f7be90b
|
|
Change-Id: If36ec5ed78a3e0b7a9037eaa1903772f1d228bce
|
|
Change-Id: I0af8eb24dab7bb9f5831bec68f9a22ba88c2be19
|
|
Change-Id: I1ea86dca37cbce416564c5e198779dd132125b02
|
|
Change-Id: I4272be68041a269dce3bbd9de2bc7997cbcf9ab8
|
|
Change-Id: I846ac849461d986d331b0366c36af46558fe9a14
|
|
Change-Id: I7670f8164d8a44414277f285e3aa19de1764a86e
|
|
Change-Id: I76904ed9596dcb0b6aa70bccd19279573687d30c
|
|
Change-Id: I5901094cb603c35a1cd8ac718fd434a9dd55729b
Reviewed-on: https://gerrit.libreoffice.org/15266
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
|
|
Change-Id: I22a9d9c313a81ccee885b9c8785d4b008a6f2058
|