summaryrefslogtreecommitdiff
path: root/sw
AgeCommit message (Collapse)Author
2013-10-23Fix indentationTor Lillqvist
Change-Id: I8471214bb2d65d46f2123feb8ff33bf46bbba1d7
2013-10-23WaE: statement aligned as second statement in if ... [loplugin]Tor Lillqvist
Full warning message: statement aligned as second statement in if body but not in a statement block. To make the warning go away, put braces around the if-ed statement (a for statement). Leaves the stuff afterwards still oddly indented but will fix that in a separate commit. Change-Id: I875569de8aa7ff587eda0da241723c900486dd43
2013-10-23Resolves: #i119963#, #i120877# import and export actual TOC contentOliver-Rainer Wittmann
Patch by: zhengfan, Oliver Review by: Oliver reintegrate from branch writer001 (cherry picked from commit 8f2a21eac4a904db3cc4c448179e2d2cf5878ef4) Conflicts: sw/inc/tox.hxx sw/source/core/tox/tox.cxx sw/source/filter/ww8/dump/ww8scan.cxx sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.hxx sw/source/filter/ww8/ww8par5.cxx sw/source/filter/ww8/ww8par6.cxx Change-Id: I75b2971f23754afa0bcb0b549bfb820dd5924b3b
2013-10-23clean up places accessing the NULL at the of an OUStringNoel Grandin
There were only a couple of real bugs fixed, but we're a little bit safer now. This also fixes the assert and the comment in OUString::operator[] about this. Change-Id: Ibe16b5794e0ba7ecd345fa0801586d25b015974c
2013-10-23clean up some include guardsThomas Arnhold
Conflicts: sw/source/ui/inc/content.hxx Change-Id: I58d81881271fc6e3320bf3b5f1321594b28614a6 Reviewed-on: https://gerrit.libreoffice.org/6388 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-23WaE: -Werror=shadowCaolán McNamara
Change-Id: I978b25d23bb2c523b3207f17c61f6569b9baa3e1
2013-10-23tiledrendering opens filesPtyl Dragon
Change-Id: Ifbf5a3aad016e1c90c4c331b2f72b44203717f90
2013-10-23tiled rendering file picker worksPtyl Dragon
Change-Id: I9936b7d366c5f02a973927381480d064eba710c6
2013-10-23tiledrendering extracts values when clicking renderPtyl Dragon
Change-Id: I4b350dc6c796bb1af0740917e17ac79b2a259a0a
2013-10-23added callback for renderPtyl Dragon
Change-Id: I56f47926eeff6ab57903c8eedf6528465fc41c9e
2013-10-23convert code to use OUString::endsWithNoel Grandin
Convert places that call aStr[aStr.getLength()-1] == 'x' to use the shorter form aStr.endsWith("x") Change-Id: I1b3a19c0e89b8989cdbeed440f95fc76f9a4b6b6
2013-10-23WaE: declaration shadows a member of 'this'Tor Lillqvist
Change-Id: I1f5b3ffccb89a5b9111e60c0a1943e1642c3499b
2013-10-23More work on selection handling in iOSTor Lillqvist
Got the selection start and end handle dragging working... The trick was not to call SwWrtShell::SetCursor(), but SwCrsrShell::SetCrsr(). Sounds easy but took a lot of guessing and experimentation to figure out. Anyway, now it does what I had expected it to do a few das ago already. There are glitches, especially in corner cases like if you move the start handle past the end handle or vice versa. more Change-Id: Id6c1d99a4052531789bccf0d48165cfb41b89cfe 9b94c0dd55b04a7b6b3c40654562a9c51fa9b450
2013-10-22Bin some pointless commentsTor Lillqvist
Change-Id: Ia7c5b1654f3decc549b363c4443863f40c3f26e6
2013-10-22sw: try to fix Android tinderbox re StringMichael Stahl
Change-Id: I73ab199eb12a89373ca75cb659a77550d3512653
2013-10-22Bin comments that claim to say why some header is includedTor Lillqvist
They are practically always useless, often misleading or obsolete. Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
2013-10-22vcl: mark more Image constructors as "explicit"Michael Stahl
Change-Id: If59d7c75c89a102a573738d15d8593cb8ac5c486
2013-10-22Bin useless swmod commentsTor Lillqvist
Change-Id: I65df74242453a907b1a1a50f391e7b017bec5fcb
2013-10-22Resolves: fdo#38838 remove UniStringCaolán McNamara
hammer silver nails into coffin and bury in concrete Change-Id: I3fda2ff47738bb33793adab97faba2d439ac9a28
2013-10-22Tiled rendering: Finishing touch to the tiledrendering.ui.Jan Holesovsky
Change-Id: I1fb7c2cfdf8ffd69f8a2b4e1aba195939424606b
2013-10-22added the tiledrendering ui from gladePtyl Dragon
Change-Id: I8c32f5f3e09d2dc6214a76cd15a0b3adba62824e
2013-10-22CLASSIO is deadTor Lillqvist
Change-Id: Ib08fe1f8faf9d4a527ac84d69eaaa19eb7102a6a
2013-10-22If they are unused drop them then!?Tor Lillqvist
Change-Id: Ia5390025eb8b71296ff019461ace88117bdc4236
2013-10-22DocxAttributeOutput: comment wanted to refer to boost::noneMiklos Vajna
Change-Id: Ia3ecac669f35c57467e62c777e18d176753fdb0e
2013-10-22rFollowDesc -> aFollowDesc, it's not a referenceMiklos Vajna
Change-Id: I1dd5626a1ff8d8209003a7c4e6df05d01fd7c7d9
2013-10-22boost::optional default ctor uses boost::none alreadyMiklos Vajna
Change-Id: I14b1a0987f18acab2f309ba423a4f31dd34211f5
2013-10-22fdo#44689: fix for specific case of page restart-value 0Adam Co
This bug fix is for roundtripping a DOCX that has a specific 'start value' for the page numbers. In most cases LO imports it ok. However - until now - Word allowed you to start page number from 0, while LO only allowed starting page numbers from 1. This was because the 'start value' was stored in an 'unsigned int', and the value '0' was used to mark 'there is no start value'. This patch changes the way the 'start value' is stored from 'unsigned int' to 'optional unsigned int'. This way - if there is no value applied - the variable will hold NULL. However - if a value is set - it can be 0 or more. This meant also tweaking all the places that used to get this value, so that now they handle an 'optional uint', instead of a 'uint'. Conflicts: sw/source/ui/inc/break.hxx sw/source/ui/inc/wrtsh.hxx sw/source/ui/shells/textsh1.cxx sw/source/ui/utlui/uitool.cxx sw/source/ui/wrtsh/wrtsh1.cxx Change-Id: I6ad9d90e03b42c58eed2271477df43c20ad6f20a Reviewed-on: https://gerrit.libreoffice.org/5681
2013-10-22Try to handle selection resizing in a more "correct" wayTor Lillqvist
Faking mouse clicks is a stupid way to do it of course. Try to do it "right". For now just worked on moving the end handle, but once that works, similar code should be used for the start handle, too. Does not work yet. It is hard to extract out from SwEditWin::MouseButtonDown() exactly what all is relevant, and what isn't, for this use case. Change-Id: I76a226f787facbac645aaff8b4852d693bcf4ccb
2013-10-21Tiled rendering: This is a desktop test app.Jan Holesovsky
Change-Id: I022ca7c6bc7a9efd874bd04eaf78836afcee21c6
2013-10-21remove unnecessary tools/string.hxx includesCaolán McNamara
Change-Id: I8ed341aeef90584dfc545a794f999e3adc08dd72
2013-10-21remove uses of COMPARE_*Caolán McNamara
Change-Id: Icdc36b4b24d2f399f481065df3200feb98025135
2013-10-21drop CharSet typedefCaolán McNamara
Change-Id: Ia160d7cbaa2ee71773483c3f91306f89cdad5947
2013-10-21fix GetSelectedText use in OSL_DEBUG_LEVEL > 1Caolán McNamara
Change-Id: I82ffba3befc4d2153c0f9015323bb5e6f1939fe8
2013-10-21Tiled rendering: VCL test app skeleton.Jan Holesovsky
Change-Id: I465dcadf14935bce4f610376b41b9a66963e2cf8
2013-10-21fdo#68849 add some header guardsThomas Arnhold
Change-Id: I9d25a58f22095689eccc0ac444c163d1e9bee69f Reviewed-on: https://gerrit.libreoffice.org/6364 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-10-21fdo#70221 fix RTF import of multi-group picturesMiklos Vajna
Pictures typically have a single RTF group, so we imported them at the end of that group. Though multiple inner groups are also allowed, so make sure we only do the import at the very end, instead of at the end of all inner groups as well, resulting in multiple (fake) pictures. Regression from 13c00ce322e78eb4e0f50ab84ded19cd6aae1ded (Enable the writerfilter-based RTF import in non-experimental mode, 2011-08-18). Change-Id: Id895b2c6d3b824d09d89bfa01ce59aba76c55d42
2013-10-20drop unnecessary tools/string includesCaolán McNamara
Change-Id: I4278999b9b7d184c26036bbe9e3b98420f461e8c
2013-10-20fdo#52622 - Reduce copy and paste codeJosé Guilherme Vanz
This commit removes copy and paste code, creating a constructor for it Change-Id: I7a66cfda7fc7c11308d155a7a890352fdacfaacc Reviewed-on: https://gerrit.libreoffice.org/6356 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2013-10-19fix CID#1038503 uninitializCaolán McNamara
Change-Id: I7b85475d757695a0e3573627266b7756989f81a7
2013-10-19CID#1038503 uninitialized memberCaolán McNamara
Change-Id: I4ceb50cf957b70a43848bb78aeaddc7957d3ffd7
2013-10-19CID1078820 has already been dereferenced on all paths leading to the checkCaolán McNamara
Change-Id: I5210d67259d445f6e7f52f176cd67af82d687e37
2013-10-19CID#1103655 logically dead code, we check for < 4 alreadyCaolán McNamara
Change-Id: I9e917530528d6e48f418f2b8fa417290a40c2403
2013-10-19CID#1103681 annotate as deliberate fallthroughCaolán McNamara
Change-Id: I731ea6aca73a81420e3d23cdb504a6151112d9a5
2013-10-19CID#736189 out of boundsCaolán McNamara
Change-Id: Ieabdd6d551b2602ec08a2b2d9bc25037d73f4dd2
2013-10-19CID#736191 out of boundsCaolán McNamara
Change-Id: Iaed9abdeb82e2f039020e95314603ad9d20aa3e4
2013-10-18Hopefully fix Android buildTor Lillqvist
Change-Id: I85170f2d65dd17e0a04a261b0680f693e2917131
2013-10-18Work in progress: Text selection handling for iOSTor Lillqvist
Change-Id: I31c6bcb9a4b26653d439601f78d71fd94d938eeb
2013-10-18fdo#60698: Move fileaccess module to ucbMarcos Paulo de Souza
Change-Id: I4c688a4aeedcae56ed6404574bd1bb392d4190cb Reviewed-on: https://gerrit.libreoffice.org/6311 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2013-10-18convert std::unique_ptr to boost::scoped_ptrNoel Grandin
I used this during my String->OUString conversion changes, but apparently it's a C++11ism Change-Id: Iff727a92d6d0c3e418275d2850ce70cbd2d2546a
2013-10-18random OUString to String conversionsNoel Grandin
Change-Id: I9cfb8e7183b9cce7c690f3a43a64b61a2aa8c754