summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-24fix for bnc#823935Noel Power
window network drive urls on import get internall converted to SMB (so it appears anyway) when exported the file:/// that was on the target ( in the relId ) for the hyperlink is dropped. Apparently the scheme isn't necessary for the binary import. If one of these strange 'detected as smb' window shares are exported make sure we add the file:/// (cherry picked from commit 8e33e95500c2f5edc91e853024a5c0fff285fcce) Change-Id: Id62e1f4845bfbc610f73499881dc33d3d955923b
2013-06-24Fix memory leak in SwTOXBaseSection::GenerateText.Mark Wielaard
Delete LinkStruct created in TOKEN_LINK_END case after copying contents. Change-Id: I294009ad62756996cf840ebf56b28d79dfd6e2f3 Reviewed-on: https://gerrit.libreoffice.org/4470 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2013-06-24convert the right number of elementsDavid Tardon
Change-Id: I375d03ad880d348be64a04613e612e19bf2f4e1c
2013-06-24various .xcus are gone nowCaolán McNamara
Change-Id: Ia9596b15b45ae16bab7f1904f6b1cb31ba3d87a8
2013-06-24Related: #i121577# Allow setting toolbar name in Addons.xcuAriel Constenla-Haile
(cherry picked from commit 96cd87ec89e5ebe9d174c90b0f2cab96b3772732) Conflicts: odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu odk/examples/cpp/complextoolbarcontrols/WriterWindowState.xcu odk/examples/java/Inspector/Inspector.java Change-Id: I6a0c1a657c6084df4efd8e150dc252155b32ba0b
2013-06-24Resolves: #i121577# Allow setting toolbar name in Addons.xcuAriel Constenla-Haile
(cherry picked from commit 37894067213a63c51c7a73083d7b0ace5f5c40da) Conflicts: framework/inc/framework/addonsoptions.hxx framework/source/fwe/classes/addonsoptions.cxx framework/source/layoutmanager/toolbarlayoutmanager.cxx officecfg/registry/schema/org/openoffice/Office/Addons.xcs Change-Id: Icc8ed1bb5ac2cfecd6c03c53c137c503dc78bc66
2013-06-24Resolves: #i116455# Make toolbar style settings persistentAriel Constenla-Haile
(cherry picked from commit fff79c8807c5b174507888a8e393f2605b28ea29) Conflicts: framework/source/layoutmanager/toolbarlayoutmanager.cxx Change-Id: I25bfff7116c04aa6e40a062ce465960e50f68f7c
2013-06-24Resolves: #i122401# framework::NewToolbarController needs...Ariel Constenla-Haile
early initialization of its PopupMenu (cherry picked from commit 5149ad822bb66cca9561b7c181c6c2279affc29a) Conflicts: framework/inc/uielement/popuptoolbarcontroller.hxx framework/source/uielement/popuptoolbarcontroller.cxx Change-Id: I619fe7b86a19b146079792a73a50d23682d04a3c
2013-06-24svx::ExtrusionDepthController is a ToolbarControllerAriel Constenla-Haile
This class is dereived from svt::PopupWindowController, derived in turn from svt::ToolboxController, the base class of all css.frame.ToolbarController's. Adapt getSupportedServiceNames() and the passive component registration to reflect that fact. (cherry picked from commit e0f9eb4cc5d2ea676a899c4cbecb97264a31fef3) Conflicts: svx/source/tbxctrls/extrusioncontrols.cxx Change-Id: I866c1dc43d31dc269ec72890041b87292b02b2f9
2013-06-24Remove dbaui::OStatusbarControllerAriel Constenla-Haile
It actually does not override any method in svt::StatusbarController, so there is no point in keeping it (cherry picked from commit 83bf5a7b85a0e3430cc807415e081a10a1775f9f) Conflicts: dbaccess/source/ui/control/makefile.mk dbaccess/source/ui/control/statusbarontroller.cxx dbaccess/source/ui/inc/statusbarontroller.hxx Change-Id: Id6adc11c3a54f642ebdec9c6016996134908da71
2013-06-24Add missing copy&paste of SfxAppToolBoxControl_Impl::SelectAriel Constenla-Haile
(cherry picked from commit 47204c74d9e52f54f6983af19b66af2a96b42e61) Conflicts: framework/inc/uielement/popuptoolbarcontroller.hxx svtools/inc/svtools/toolboxcontroller.hxx Change-Id: I304d17c662450f29eeffb17f576b418986f3fb0a
2013-06-24Kill SfxAppToolBoxControl_ImplAriel Constenla-Haile
(cherry picked from commit 273121f8d7e277e35c8e5a8aad46ef0c103ebc03) Conflicts: sfx2/inc/sfx2/mnuitem.hxx sfx2/inc/sfx2/tbxctrl.hxx sfx2/source/appl/appreg.cxx sfx2/source/menu/mnuitem.cxx sfx2/source/toolbox/tbxitem.cxx Change-Id: I6d0750d89ad009f82c5552d971537b78e45426f2 Silence warning C4706 (cherry picked from commit 0b373b3e4c45d09c40a8949e9366adb9b991de4b) Change-Id: Id497469eba8288565145c47c84b7938a1316c21a
2013-06-24Better approach for solving fdo#52204abdulmajeed ahmed
Change-Id: Iada36661abaef0363688a186f0542f62dfb1455c
2013-06-24fdo#56679, fdo#65710 : fix for import and export of underline colorAdam Co
Change-Id: Ifc45900d73802ef99c55d7af4ee04314dd04f1c5 Reviewed-on: https://gerrit.libreoffice.org/4459 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-06-24framework::PopupMenuController clean-upAriel Constenla-Haile
Changed the name, it is not a PopupMenuController, but a ToolbarController that shows a PopupMenu filled at runtime by a PopupMenuController Make it a base class for other ToolbarController components, there is no sense to make it a component by itself Use this base class for three new pure UNO ToolbarController's (cherry picked from commit 9d1015051c92900def3d465d2eb8bf179f19a398) Conflicts: framework/Library_fwk.mk framework/inc/uielement/popupmenucontroller.hxx framework/source/uielement/popupmenucontroller.cxx officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu Change-Id: I2f5ec06df098d65ffaa17a8f7f6f3ea8774b43c3
2013-06-24fix exception in DbGridColumn::impl_toggleScriptManager_nothrowNoel Grandin
The messages would look like this: warn:legacy.osl:28639:1:svx/source/fmcomp/gridcell.cxx:255: caught an exception! I introduced this bug in commit 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 "Use the new type-checking Reference constructor to reduce code noise" Change-Id: I922d46f7c7eefbc12892a2525b30dcb798619a8b
2013-06-24fdo#43460 shell,vcl,xmlreader: use isEmpty()Jelle van der Waa
Change-Id: Ie3d16da6c246b79c4c304b21476f84b2788f0d6e Reviewed-on: https://gerrit.libreoffice.org/4444 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-06-24fdo#52204 add more diacritics for Arabicabdulmajeed ahmed
Change-Id: I916eb34b127699ea3251e92f4d7b705347ae5cba
2013-06-24remove XPopupMenuExtended from pchCaolán McNamara
Change-Id: Id36e374baa1e90cfb5aff9841cf3a1894385a47e
2013-06-24Add another fallback-path for wilangid.vbsChristian Lohmaier
on Windows Server 2012, it ends up in c:/Program Files (x86)/Windows Kits/8.0/bin/x86/wilangid.vbs and c:/Program Files (x86)/Windows Kits/8.0/bin/x64/wilangid.vbs (files are identical) No full-blown configure check is needed IMHO, since that stuff is part of a bigger install, and not installed separately. AFAICT it is only used when building the translated installsets Change-Id: I1238717bb08635848bb4c54bf4f6b4049e0bc777 Reviewed-on: https://gerrit.libreoffice.org/4468 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com>
2013-06-24blasted pch includesCaolán McNamara
Change-Id: I2a518445dfd06086cbd1acaece45a3ed9de0ce7b
2013-06-23Resolves: #i121947# Default User-AgentAriel Constenla-Haile
(cherry picked from commit 339d75d9c99462d63234845031f24a42e7ffdd27) Conflicts: ucb/source/ucp/webdav/DAVResourceAccess.cxx ucb/source/ucp/webdav/makefile.mk Change-Id: Ie74275cfa9953fdc4fa0801224909efbcecab3a9
2013-06-23fix the test caseMarkus Mohrhard
The old content did not make any sense. Change-Id: I1a593f88f1628db0c9b60d399909820d4dd2b3db
2013-06-23Complain about too old doxygen only when there is oneLionel Elie Mamane
Change-Id: I6c460375945eac8dccddca196f67b8d224e0d34e
2013-06-23ExtendedColorScheme.xcu is localizableAndras Timar
Change-Id: I566f50761478b9e18a47a460834258902a905b82
2013-06-23Resolves: #i121542# Unify the Menu APIAriel Constenla-Haile
(cherry picked from commit 399946b82f5efec19cd82d1c320d5aa9295d235d) Conflicts: chart2/source/controller/main/ChartController_Window.cxx framework/source/uielement/langselectionmenucontroller.cxx framework/source/uielement/popupmenucontroller.cxx framework/source/uielement/recentfilesmenucontroller.cxx framework/source/uielement/toolbarsmenucontroller.cxx odk/examples/DevelopersGuide/GUI/UnoMenu.java odk/examples/DevelopersGuide/GUI/UnoMenu2.java odk/examples/cpp/StatusbarController/SelectionModeStatusbarController/SelectionModeStatusbarController.cxx offapi/com/sun/star/awt/MenuBar.idl offapi/com/sun/star/awt/MenuEvent.idl offapi/com/sun/star/awt/MenuItemStyle.idl offapi/com/sun/star/awt/MenuItemType.idl offapi/com/sun/star/awt/MenuLogo.idl offapi/com/sun/star/awt/PopupMenu.idl offapi/com/sun/star/awt/PopupMenuDirection.idl offapi/com/sun/star/awt/XMenu.idl offapi/com/sun/star/awt/XMenuBar.idl offapi/com/sun/star/awt/XMenuBarExtended.idl offapi/com/sun/star/awt/XMenuExtended.idl offapi/com/sun/star/awt/XMenuExtended2.idl offapi/com/sun/star/awt/XMenuListener.idl offapi/com/sun/star/awt/XPopupMenu.idl offapi/com/sun/star/awt/XPopupMenuExtended.idl offapi/com/sun/star/awt/makefile.mk offapi/type_reference/types.rdb svtools/inc/svtools/popupmenucontrollerbase.hxx svtools/source/uno/popupmenucontrollerbase.cxx svx/source/tbxctrls/extrusioncontrols.cxx toolkit/inc/pch/precompiled_toolkit.hxx toolkit/inc/toolkit/awt/vclxmenu.hxx toolkit/inc/toolkit/helper/listenermultiplexer.hxx toolkit/source/awt/vclxmenu.cxx Change-Id: I3d9a1e109b9ff35901a3075b44a4c27e7c12b5c7 Related: #i121542# css::awt::XPopupMenu::execute() needs a Rectangle (cherry picked from commit c01a6f4f370b72f0751cf4f5c11310682e2b3248) Conflicts: odk/examples/DevelopersGuide/GUI/UnoMenu2.java offapi/type_reference/types.rdb toolkit/inc/toolkit/awt/vclxmenu.hxx Change-Id: I2cccc95086fe3d1522d03346e3c577fb2f21f621
2013-06-23Resolves: #i122317# Mark API name as not localizableAriel Constenla-Haile
(cherry picked from commit 9f65bceb5d3e43619b929d17e5f4aa4387a70eb5) Change-Id: I5b80f23ebf9ee08daab3be74f3c597a9cc302973
2013-06-23Resolves: rhbz#976304 gallery elements may not support document.SettingsCaolán McNamara
so the createInstance throws, so the element doesn't get inserted into the documents. regression since f0cd6fe9075cd0aa00162474784ad804a07ed138 Change-Id: Ie6cef7a4f0d5ac8a34d41139c3439fc04e9c7f20
2013-06-23we don't need this hack without inherited number formats, fdo#66076Markus Mohrhard
Change-Id: If315ce28a4182019002141c7330475e0843f9a40
2013-06-23Fix linking error of app for iOS in optimized buildTor Lillqvist
ShowLockedDocumentDialog uses the DocumentLockFile API which is not compiled for non-desktop OSes (see svl/Library_svl.mk). This leads to an undefined reference to svt::DocumentLockFile::m_bAllowInteraction. As ShowLockedDocumentDialog isn't used anyway without HAVE_FEATURE_MULTIUSER_ENVIRONMENT, put it inside such an #if, too. Thanks to Tsahi Glik <tsahi.glik@cloudon.com> for noticing. Change-Id: I45d2179395b44709c52ab1871866a2bd5720c8b6
2013-06-23make "gcc -Werror" happyLionel Elie Mamane
Change-Id: I6dd1bf6b4535bb956cb7e85908312d52749a6f2b
2013-06-23Data-aware ListBox: fix case ListSourceType==TableFieldsLionel Elie Mamane
Change-Id: I9a89374fd1cc56c8185753f5959275a0a2d841ff
2013-06-23ListBox: when LISTSOURCETYPE changes, need to (un)lock BOUNDCOLUMNLionel Elie Mamane
Change-Id: If83073ec19c1389bf87fc154fa0ae83fd5bd1f3a
2013-06-23Don't second-guess the databaseLionel Elie Mamane
If it gives us a NULL as bound value, use it, even if the underlying column has constraint NOT NULL. This can happen e.g. in OUTER JOIN, with UNION, ... Change-Id: I1fc0d9366764b90e0cdb443cd34c32b52f059e0b
2013-06-23Data-aware ListBox: use entry for NULL if the *bound* value is NULLLionel Elie Mamane
as opposed to when the display string is empty. Change-Id: I802955404d2d8d5c91b3fd1633e34be7ef4f0b82
2013-06-23Use unsigned values in m_a(Converted)BoundValuesLionel Elie Mamane
Values that come from the database are always signed (we inherit that from sdbc that inherits that from jdbc that inherits that from Java's type system that does not have unsigned values) So when using unsigned values, they always operator==-compare false! Change-Id: I604b04afa23ede835c1f3db1f8c1bdeafbfba7ea
2013-06-23enhance commentLionel Elie Mamane
Change-Id: I897a59d10a903bfe303b1ac059f19b6dcc686616
2013-06-23avoid initialise-then-resetLionel Elie Mamane
Directly construct as unitialised Change-Id: I66aa4f5a5f5ed2c1d5bf0cb8083e1968ef776bf7
2013-06-23fdo#66002 correct error introduced by "AppendAscii cleanup"Lionel Elie Mamane
This reverts fix endless loop error: 865b5caf6e2256e06f46a39a86d67f03408718a9 which was a partial revert of AppendAscii cleanup: b7df3446c373a93dc5b77b495a54d873d83a91a7 AND fixes the original error in "AppendAscii cleanup". Change-Id: Ida29af046b277170388e4945c0cdb4ec6116be98
2013-06-23fix endless loop errorDavid Ostrovsky
This partially reverts this commit: b7df3446c373a93dc5b77b495a54d873d83a91a7 Change-Id: Id05939da35541f9620d03d9d3998e618d0bb9092
2013-06-23cppcheck: fix inefficient checkingJulien Nabet
Change-Id: If015900345304a9545ab0b66c6998a9d6bad9d1f
2013-06-23fix missing content of header tabs with gtk vclplugCaolán McNamara
regression since e717d1dcce7f8906311c5ccdbb2326b61a702630 Change-Id: I72e6e2f3ef093f272765036ebfc60b3f56a8fc34
2013-06-23update creditsChristian Lohmaier
previous version had a section "developers not committing since ..." no idea how that was generated. Same content as website http://www.libreoffice.org/about-us/credits/ Change-Id: I46f2ce1e88e946640ace81a375ce5483bec8440b Reviewed-on: https://gerrit.libreoffice.org/4426 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-23fdo#50506, incomplete indent markers in Mac rulersKhaled Hosny
AquaSalGraphics::drawPolygon() should close the path like other polygon drawing functions. It have been like that for 5 years since 3ca40fb8a2e8c805517b351ebd97c1385cfc92a3, no idea how it was never noticed. Change-Id: Ifba740afa66ad485943c7873d78e007b778cd7b3 Reviewed-on: https://gerrit.libreoffice.org/4448 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-06-22missing declared dep on boost_headers for editeng lookuptree cppunit testNorbert Thiebaud
Change-Id: Ia1ff089cd684445f4f76a7020cb55d83cf84dd68
2013-06-22fdo#65370 Dock ElementsDockingWindow to left at initial use and redrawTomaž Vajngerl
Change-Id: I0a7648569541667bba80cffde978558a9206c089
2013-06-22fdo#66048: export cannot handle starting \\\"Zolnai Tamás
Old stuff. By now we always have to add double quotes to the edges of text. Change-Id: I14ca7283d723bf87fb232288d92e53393e90103e
2013-06-22Trie lookup tree code review fixesTomaž Vajngerl
Change-Id: Ib2d2b668f2ec17742a069d63506cdd2d25d10f0d
2013-06-22fix debug build on s390xDavid Tardon
Change-Id: Ic1d5e98f371727f0c452495d5f9cb40ec73ffe9d
2013-06-22kill TBX_UPDATER_MODE_*Ivan Timofeev
commit 4f036439f7597d33a9f90860d9a5b6ac28b270c7 "Kill unused TBX_UPDATER_MODE_NONE." removed TBX_UPDATER_MODE_NONE, but it was actually used, but written as literal 0 in ctor (default value for nMode). Worse, TBX_UPDATER_MODE_NONE meant "draw a square color mark" (!) and after removing it color-marks were not drawn for some buttons, e.g. frame color button. This patch makes use of TBX_UPDATER_MODE_CHAR_COLOR_NEW (which means "draw a rectangle color mark") everywhere, TBX_UPDATER_MODE_CHAR_COLOR and TBX_UPDATER_MODE_CHAR_BACKGROUND were unused. Change-Id: I7452bf73227cd7038e5ea9ab740745125ca079b4