summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)AuthorFilesLines
2012-07-08removed unused includesTakeshi Abe1-2/+0
Change-Id: I248ef370c55c18d60a8ea32ef92f70734bffbaf2
2012-07-06fdo#38071: roll back change to MarkBase::IsCoveringPosition:Michael Stahl1-3/+4
This change seems wrong as the end position is actually behind the CH_TXT_ATR_FIELDEND; fortunately it is also unnecessary because the change in MSWordExportBase::OutputTextNode is sufficient to fix the crash. Change-Id: I79d508b13ecc8d85c4e09149b44695436416ba6d
2012-07-06fs34b: #i117039# restore old behavior of SfxUndoManager::EnableUndo: don't ↵Frank Schoenheit [fs]1-6/+3
count the calls, but maintain a simple flag. Consequently, let sw's UndoManager simply delegate now, and change the UndoManagerHelper to maintain a lock counter itself.
2012-07-06fdo#33960: fix cross reference number test failureMichael Stahl2-37/+48
Change-Id: If50a09a14ad30fa3dcb587d6e59a5a0d161394b1
2012-07-06sw: InsertNewPage() should ignore GetFirstFmt() if it's sharedMiklos Vajna2-9/+3
This allows to get rid of the ugly hack in SwLayHelper::CheckInsertPage() and has the same effect. Change-Id: I491eb617c42bbca3ca1676d7bf44795e947ce6f9
2012-07-06Merge branch 'feature/template-dialog'Rafael Dominguez10-8/+14
Conflicts: sfx2/Library_sfx.mk sfx2/inc/sfx2/sfxcommands.h sfx2/inc/sfx2/sfxsids.hrc sfx2/source/appl/appserv.cxx svtools/Library_svt.mk Change-Id: I4305d81cb5fd6f5192a29f85835c78f31310b0d6
2012-07-06wwSectionManager::SetUseOn: forgot to share first header/footer on even pagesMiklos Vajna1-1/+2
It make little sense to share it only on odd pages. Change-Id: I13188fb10b073d8c351c0cc7dc5110afd25faccf
2012-07-05sal_uInt16 matches UniString sal_Unicode ctor, not FontFamily enumCaolán McNamara1-1/+1
i.e. totally the wrong thing entire Change-Id: I24c6f7ca625affe808f865b8962cb690ce1c8755
2012-07-05sw: SwLayHelper should not consider the page after first page a first pageMiklos Vajna1-0/+5
Change-Id: Ic82dc11cca65692e221f49d43adb8b72a07aec7d
2012-07-05sw: InsertNewPage() should fall back from first to left/right as wellMiklos Vajna1-0/+5
Change-Id: I87715dcf843b025b8291a76bdfdd3a06d2ffac23
2012-07-05SwLayHelper: when the page style name changes, we have a first pageMiklos Vajna1-1/+2
Previously we only considered the first page of the whole document as first page, which was incorrect. Change-Id: I2e37fe504a5baee986d63d0cdef166f836877174
2012-07-05sorted all include statements alphabetically in sw/source/core/bastyp/Philipp Riemer13-149/+150
* fixing the missing include statements in shellres.hxx (bjoern-michaelsen) Change-Id: I976586b346facf38905391bd336b7f08b218f4a4
2012-07-05fix Windows build, include vectorMichael Stahl1-4/+6
Change-Id: Ia07e12c9fa5430d7f8fa02a2a8ab6cde3aafa41a
2012-07-04fix previous STL conversion commit:Michael Stahl1-3/+2
Change-Id: I08c346dff3d62240a24091f569f04be2f517b7b0 SwAutoCompleteWord::InsertWord: pNew has to be inserted in both branches
2012-07-04Convert Svptrarr to std::deque<SwAutoCompleteString*>Noel Grandin2-60/+54
And convert some salBool to bool. Change-Id: I57248b2a316009d0b4e6f5d24963a361312bafd9
2012-07-04Convert Svptrarr to std::vector<SwPosition*>Noel Grandin2-8/+8
Change-Id: I0e6db9fb0e628cc0d4e6556c71542bd0efc48a86
2012-07-04Convert Svptrarr to std::vector<const SwUserFieldType*>Noel Grandin3-13/+13
Also convert method return type from sal_Bool to bool Change-Id: I259e99709297d4c3b9b74643920e2afefa469a93
2012-07-04Convert Svptrarr to std::set<const SwTxtFld*>Noel Grandin2-11/+9
Change-Id: I71bfd2075c7dd7a97fd5553c8e55e614d6be4cf3
2012-07-04Convert Svptrarr to std::deque<const SwTxtAttr*>Noel Grandin2-15/+14
Change-Id: I527814582214401a1f7dd9c192e6aa96e45f7819
2012-07-04Convert Svptrarr to std::vector<SvGlobalName*>Noel Grandin2-11/+8
Change-Id: Iafd2dc1d4bf4bf3dd875a33a37ea9038f3e083fe
2012-07-04Convert Svptrarr to std::vector<SwRedline*>Noel Grandin1-6/+5
Change-Id: I0185a08d2ebb6751b802972f14bf46edfc63c9e7
2012-07-04Convert Svptrarr to std::vector<SwPosition*>Noel Grandin1-13/+9
Change-Id: I1527f6c319d536286e1dc12c8c9ffa3b6a0e3713
2012-07-04Convert Svptrarr to std::vectorNoel Grandin1-13/+4
Change-Id: Ia385f3b004f9d4744035b43e0e049dbb19da774b
2012-07-04refactor handling of double border widths:Michael Stahl7-15/+18
Word uses a completely different definition of "width" of a double border than OOo and ODF: for Word the width is apparently the largest of the 3 component widths, while OOo and ODF define the width as the total with of all 3 components. The new border implementation in LO 3.4 was apparently inspired by Word's double border definition, which resulted in various import filter regressions, see the previous fixes: 36e43b52992735c622833e923faa63774b9e2f76 e2ffb71305c5f085eec6d396651c76d6daee3406 70a6a4d425558340bb49507975343a3e0a1bdde8 These fixes set the ScaleMetrics, which actually seems sub-optimal as there is a ScaleItemSet function somewhere that apparently re-scales all items in an itemset, which could undo the fixes. Also, one of the fixes actually managed to break RTF/DOCX import of double borders, as that ended up in the same code via the API. This commit now reverses the change, so that the width of a border is now always the total with of all components, which is (imho) much more intutitive, and also leads to a consistent UI where selecting say 3pt width has predictable results, no matter what the border style. The border widths are now converted in the Word format import/export filters (writerfilter and sw/source/filter/ww8), and various tests were adapted to the new handling. Change-Id: I50456c49b1a298569607e6c88f19f18441348ac3
2012-07-04replace enum SvxBorderStyle with css::table::BorderLineSyleMichael Stahl27-198/+243
Change-Id: I1dadb53f46b23f92d34061ef78dda872bdbcda67
2012-07-04ww8par: unused includesMiklos Vajna1-45/+0
Change-Id: I9aab92f88194d7e0217150c036b00c6444bb0231
2012-07-04wwSectionManager::SetUseOn: share first page header / footer by defaultMiklos Vajna1-2/+2
Change-Id: I4e0c605cfe4f906a9a0a45d49e89b990b64ade07
2012-07-04renamed "MakeFormel" into "MakeFormula" (in sw/)Philipp Riemer4-7/+7
Change-Id: I1da8e5e7b8d12895c099a6c0cc259009e76aa341
2012-07-04sw: drop some unused includesMiklos Vajna1-14/+0
Change-Id: Ia17354be0b8cea2ba519c1d907b69034cd434567
2012-07-04SwDoc::ChgPageDesc: copy page size to first pageMiklos Vajna1-1/+5
Change-Id: I714c8cb16710e4220ce97e8b5597b5ff9f4f0bab
2012-07-04sw: tell InsertNewPage() if that'll be a first pageMiklos Vajna5-7/+12
And in that case we can unconditionally call GetFirstFmt(), as the SwPageDesc copying methods take care of the "shared first/right" setting already. With this, the layout handles HeaderIsSharedFirst and FooterIsSharedFirst correctly when the first page is the first physical page. Change-Id: Ib6d922aebaa1384856f79f2501dfbe087a74a20f
2012-07-04SwPageDesc: let IsHeaderShared() not affect IsHeaderSharedFirst()Miklos Vajna1-2/+2
Change-Id: I23224f4b408e36a858cd8ce6b1cfbdaac2bf4b60
2012-07-03ditch String::CreateFromAsciiCaolán McNamara123-379/+344
Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691
2012-07-03sw: missing RES_FRAMEDIR in SwPageDesc::aFirst's itemsetMiklos Vajna1-0/+5
Change-Id: I695dae12060de2d7ec20ca222b8eadf93a6e9d79
2012-07-03SwDoc: initialize first page format as wellMiklos Vajna1-3/+8
Change-Id: I788584d4e32731b7bc76086df88640b59f27dfc1
2012-07-03Remove duplication of License/Credits informationStefan Knorr (astron)6-6/+0
A bit differently this time around: + remove Credits menu item from menu + remove License button from the About dialog Change-Id: I07c1e115aa209ef1d69458f5b188d73caaae4294
2012-07-03sw: include footer type in layout dump, now reallyMiklos Vajna2-4/+4
Change-Id: Ie4b5d04824316c03e7a0b5bdb9d04bd42fad5f88
2012-07-03SwPageDesc: add GetFirstFmt methodsMiklos Vajna1-2/+13
Change-Id: Id0e1185950446d0c9b7159a406315540956baed1
2012-07-03hrc cleanup: Remove unused hrc filesThomas Arnhold2-43/+0
Change-Id: I16d83ca3ea0e01f2c0f4115db18b97958e51afde
2012-07-02hrc cleanup: Remove include guardsThomas Arnhold1-2/+0
Also add some missing include guards. Change-Id: I320a3c017ca65d34f2cd516849bcde3dec9b33f1
2012-07-02hrc cleanup: Remove unused definesThomas Arnhold1-3/+0
Change-Id: I3fa45e4550295b94a6ab0acf9bcd0b25db73e689
2012-07-02replaced switch with if/else because of only one casePhilipp Riemer1-32/+27
Change-Id: I23182e5754b5af63932cc696febeb03c8d0b977d
2012-07-02sw: include header/footer type in layout dumpMiklos Vajna2-2/+9
Change-Id: I27318fbaf71874d34671c0da820caee6cdb22ace
2012-07-02Remove unused definesThomas Arnhold11-125/+0
Some of them were commented out for documentation purpose. Change-Id: I29a6b2cbe774b527f0c3a0be5675160817a7f3ce
2012-07-02hrc cleanup: Remove unused definesThomas Arnhold20-58/+0
Change-Id: Iaa7da7745fc01544d9a503b313479b2450810524
2012-07-02Remove commented out codeThomas Arnhold1-2/+0
PEN_SOLID isn't anymore, so this isn't working anyway. Change-Id: I17e41dba889be909b7a3d41f39ab4409627bf61e
2012-07-02fix coding style of previously added tmp variablePhilipp Riemer1-5/+5
Change-Id: I40d67918e13239141176ff31159653f79af46f88
2012-07-02SwDoc: kill copy&paste with CopyMasterHeader() and CopyMasterFooter()Miklos Vajna2-189/+117
Change-Id: I10480cc7977e7227a6abe84e7bf27f69a980f89a
2012-07-02targetted improvement of UNO API includes / usageMichael Meeks4-16/+4
2012-07-02sw: initial HeaderTextFirst / FooterTextFirstMiklos Vajna8-3/+137
The header/footer text for the first page can now be written (document model ready), but layout doesn't take it into account yet. Also, SwDoc::ChgPageDesc() has some copy&paste, will fix that soon. Change-Id: Ic28659f028e7db4aa1b6eefc76a4e672127e2c98