summaryrefslogtreecommitdiff
path: root/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
AgeCommit message (Collapse)AuthorFilesLines
2013-09-20Turn sidebar back to non-experimentalCaolán McNamara1-226/+0
This reverts commit 7ce2a89f4f8fa84232896766276cb3433ada239c. Change-Id: I53f572777e84f66fd4c3d18fb686dac09095804a revert d38cb53e3bcf3fd95a75e03b01c3b7a209d07b46 Change-Id: I5b243b69e50084316aaeab250d6b01079c12b718 Revert "sidebar: disable impress task pane if sidebar is enabled." This reverts commit ee1726bfdba483623d496a3bcc09089e8b55cd65. revert 54d820a7815af03a248c1aa424fae9bf9a4881f4 Change-Id: Ie7c83d88f5427a7e42fa50879280a0c4a7c2cdd1 Revert "Only register and use the Sidebar if it is globally enabled." This reverts commit 66a5cc468cef0c6db8b42b7f25367f04208e6f2e. Conflicts: sfx2/source/view/viewfrm.cxx Change-Id: I17fe702996c4adf7f387573d36ea993f8cc32c96 Revert "disable sidebar menu option if it is disabled." This reverts commit 05f0eb57618d090fa45011120a907a3b1157accb. Revert "finally get the taskpane rendering again" This reverts commit 228bb7ffe0d404ba1225f7b4d26ca71e098577d9. Conflicts: officecfg/registry/data/org/openoffice/Office/Impress.xcu sd/source/ui/framework/factories/TaskPanelFactory.cxx sd/source/ui/framework/tools/FrameworkHelper.cxx Change-Id: I248cc9a769695cde19e78774d42ce666dc685599 Revert "don't throw up the sidebar on start." This reverts commit 645db9a2bd9b1eec381de60c491e6b7f9ee7a7b4. Conflicts: officecfg/registry/data/org/openoffice/Office/Views.xcu Change-Id: I911859757e2e019836e8ed5213d2ba69ff82aec8 Revert "update to the right service name for new URLs." This reverts commit 55f49970f4085e3a1498961edabd5303bd6bea6c. Conflicts: sd/source/ui/framework/tools/FrameworkHelper.cxx Change-Id: I1ba2762a4c969a9125ff8354a9b6035813290021 Revert "tentatively restore more UNO / task-pane goo ..." This reverts commit 052ac10a6f9b28b9b06884dd3ed41879722be6c9. Conflicts: officecfg/registry/data/org/openoffice/Office/Impress.xcu Change-Id: I7e62f27329af033df811549436718648a6447dea Revert "more reverts, first cut at making sidebar optional." This reverts commit a65a423e22fc03d0b7850bbf20dfc30f6cfa34dd. Revert "add experimental option for sidebar to 'Advanced' pane." This reverts commit 54d820a7815af03a248c1aa424fae9bf9a4881f4. Conflicts: cui/source/options/optjava.cxx sd/source/ui/framework/module/ImpressModule.cxx Change-Id: I09a6c0f7834c8ef330d05a014505aaaf09ae096f Revert "Restore FrameworkHelper taskpane URLs." This reverts commit e9c2d5b26b1e1b52bdf87192a76314b7362fa80c. more foo Change-Id: I2eaa2fbd74dc7a2f7ba937d310472cee6b5a0b57 really go to town on it Change-Id: I885dc03cd0286bbfdf05c05da9f0bbea2b78bcf4
2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák1-1/+1
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2012-11-28re-base on ALv2 code. Includes:Michael Meeks1-23/+14
Patches contributed by Armin Le-Grand #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles... http://svn.apache.org/viewvc?view=revision&revision=1293316 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 Patches contributed by Andre Fischer http://svn.apache.org/viewvc?view=revision&revision=1172128 http://svn.apache.org/viewvc?view=revision&revision=1172133 Patch contributed by Ariel Constenla-Haile i#118505# - Remove MN_OLE_OBJECT menu item from Draw/Impress contextmenu - CWS contextmenu1 http://svn.apache.org/viewvc?view=revision&revision=1182915 Patch contributed by Zhang Jian Fang #118876#, Add check if the OutlinerParaObject is created successfully http://svn.apache.org/viewvc?view=revision&revision=1243381 restore a re-based rdbedit.
2012-06-29removed unnecessary forward declarations of classTakeshi Abe1-4/+0
except * sd::ViewTabBar moved to ViewShellBase.hxx * sd::TemplateEntry moved to AllMasterPageSelector.hxx Change-Id: I802cdc0b77027bbe0843fbb259ce1a5a46354fc3
2012-03-01New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problemStephan Bergmann1-1/+1
...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type" for the problem.
2011-03-12Merge commit 'ooo/DEV300_m101' into integration/dev300_m101Bjoern Michaelsen1-6/+7
2011-01-17removetooltypes01: #i112600# Remove tools types from sdCarsten Driesner1-5/+5
2010-10-28add modelines to .hxx files as wellCaolán McNamara1-0/+3
Notes: split repo tag: impress_LIBREOFFICE_3_3_FREEZE
2010-10-05more removed include guards using fixguard.pyPetr Mladek1-0/+0
2010-07-13CWS changehid: resync to m84Mathias Bauer1-6/+0
2010-06-14cws impress190: rebase m82Christian Lippka1-6/+0
2010-06-07fix warningsPhilipp Lohmann [pl]1-0/+1
2010-06-04changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in ↵Philipp Lohmann [pl]1-1/+1
dummies for all explicit help ids
2010-05-05#i89450# removed unused codeChristian Lippka1-6/+0
2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun ↵Jens-Heiner Rechtien1-4/+1
Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
2009-01-21CWS-TOOLING: integrate CWS sjfixes10Vladimir Glazounov1-2/+8
2009-01-15 14:02:24 +0100 af r266369 : #i88851# Finding the right font size is now an iterative process. 2009-01-15 11:01:59 +0100 wg r266354 : i97985 2009-01-15 10:57:33 +0100 wg r266353 : i97985 2009-01-15 10:48:53 +0100 wg r266347 : i97985 2009-01-15 10:48:23 +0100 wg r266346 : i97985 2009-01-15 10:46:47 +0100 wg r266345 : i97985 2009-01-15 10:45:43 +0100 wg r266344 : i97985 2009-01-15 10:45:14 +0100 wg r266343 : i97985 2009-01-15 10:44:38 +0100 wg r266342 : i97985 2009-01-15 10:43:56 +0100 wg r266341 : i97985 2009-01-15 10:42:50 +0100 wg r266340 : i97985 2009-01-15 10:41:40 +0100 wg r266339 : i97985 2009-01-15 10:39:46 +0100 wg r266337 : i97985 2009-01-15 10:00:09 +0100 hde r266336 : i98065 2009-01-13 15:48:20 +0100 wg r266232 : i97985 2009-01-13 13:22:05 +0100 wg r266217 : i97985 2009-01-13 12:34:05 +0100 wg r266210 : i97985 2009-01-13 12:30:56 +0100 wg r266209 : i97985 2009-01-13 12:26:56 +0100 wg r266208 : i97985 2009-01-12 15:58:06 +0100 wg r266165 : i97985 2009-01-12 15:43:24 +0100 wg r266163 : i97985 2009-01-08 16:21:47 +0100 sj r266023 : fixed warning 2009-01-08 15:33:34 +0100 sj r266017 : fixed warning 2009-01-06 18:13:42 +0100 sj r265935 : CWS-TOOLING: rebase CWS sjfixes10 to trunk@265758 (milestone: DEV300:m38) 2008-12-10 16:54:02 +0100 af r265206 : #i43354# Do not delete all unused master pages automatically. 2008-12-04 13:12:50 +0100 af r264836 : #i92795# Use BitmapEx for icons to allow transparency. 2008-12-02 17:01:49 +0100 af r264723 : #i93082# Fixed SID_INSERTPAGE_LAYOUT_MENU. 2008-11-28 14:37:28 +0100 af r264555 : #i88851# Changed association of Ctrl-'?' to views. 2008-11-28 11:38:52 +0100 af r264535 : #i96681# Set version to 1.0.2 2008-11-28 11:30:04 +0100 af r264533 : #i88851# Ctrl-1,2,3 switch to slide overview, notes, normal view. 2008-11-27 16:41:25 +0100 af r264505 : #i92144# Removed unused code. 2008-11-26 15:29:56 +0100 af r264401 : #i92574# Do not lock configuration controller when main pane is not available. 2008-11-21 10:13:40 +0100 sj r264112 : #i96146# applied patch (ambiguous && ||) 2008-11-20 20:12:06 +0100 sj r264097 : #i96083# applied patch (ambigous && ||) 2008-11-20 19:13:53 +0100 sj r264096 : #i96163# applied patch (ambigous && ||) 2008-11-20 18:39:10 +0100 sj r264093 : #i96165# applied patch (ambigous && ||) 2008-11-03 18:12:29 +0100 sj r263303 : #i93996# fixed word wrapping problem 2008-11-03 18:11:02 +0100 sj r263302 : #i93996# fixed word wrapping problem 2008-11-03 18:08:41 +0100 sj r263301 : #i93996# fixed word wrapping problem 2008-11-03 18:06:45 +0100 sj r263300 : #i93996# fixed word wrapping problem 2008-11-03 18:05:00 +0100 sj r263299 : #i94831,i93616# fixed crash when importing diagonal cell border lines, fixed table import 2008-11-03 18:00:43 +0100 sj r263298 : #i93718# spellchecking is no longer triggering the autolayout of connector objects
2008-04-11INTEGRATION: CWS changefileheader (1.11.298); FILE MERGEDRüdiger Timm1-25/+18
2008/04/01 12:39:22 thb 1.11.298.2: #i85898# Stripping all external header guards 2008/03/31 13:59:03 rt 1.11.298.1: #i87441# Change license header to LPGL v3.
2008-04-03INTEGRATION: CWS presenterview (1.11.54); FILE MERGEDKurt Zenker1-3/+4
2007/03/12 15:43:06 af 1.11.54.1: #i75317# Remove dependency between slide sorter and ViewShell.
2006-12-12INTEGRATION: CWS sdwarningsbegone (1.10.126); FILE MERGEDKurt Zenker1-3/+3
2006/11/27 13:48:13 cl 1.10.126.1: #i69285# warning free code changes for sd project
2006-05-09INTEGRATION: CWS cmcfixes25 (1.9.12); FILE MERGEDJens-Heiner Rechtien1-3/+3
2006/05/05 11:18:06 cmc 1.9.12.1: #i64908# extra qualifications
2006-04-26INTEGRATION: CWS taskpane (1.8.114); FILE MERGEDKurt Zenker1-83/+72
2006/04/18 15:49:06 af 1.8.114.4: #i61115# Added InvalidateItem() and methods for modifying maTokenToValueSetIndex member. 2006/03/24 12:28:52 af 1.8.114.3: #i61115# Reorganization of acessing the valueset. Support for ordering master pages. 2006/02/22 09:50:55 af 1.8.114.2: #i61359# Major restructuring of MasterPageContainer and MasterPagesSelector. 2006/02/17 13:32:14 af 1.8.114.1: #i61359# Major restructuring of MasterPageContainer and MasterPagesSelector.
2005-09-09INTEGRATION: CWS ooo19126 (1.7.64); FILE MERGEDRüdiger Timm1-47/+21
2005/09/05 13:24:59 rt 1.7.64.1: #i54170# Change license header: remove SISSL
2005-07-14INTEGRATION: CWS impress51 (1.6.46); FILE MERGEDKurt Zenker1-12/+14
2005/06/20 12:45:59 af 1.6.46.2: #i50712# Added support for keyboard driven context menu. 2005/05/24 09:26:33 af 1.6.46.1: #i49735# Made AssignMasterPageToPageList() protected.
2005-03-18INTEGRATION: CWS impress36 (1.5.2); FILE MERGEDKurt Zenker1-5/+5
2005/02/24 12:22:03 af 1.5.2.1: #i43335# Made controls constructable on demand.
2005-02-16INTEGRATION: CWS impress33 (1.3.120); FILE MERGEDVladimir Glazounov1-6/+51
2005/02/03 14:13:10 af 1.3.120.2: #i41507# Moved MasterPageContainer specific code into new MasterPagesContainerSelector class. 2005/02/01 15:48:53 af 1.3.120.1: #i41507# Added mnDefaultClickAction member. Avoiding unnecessary copies of master pages. Code cleanup.
2005-01-31INTEGRATION: CWS iha06 (1.3.80); FILE MERGEDRüdiger Timm1-2/+4
2005/01/18 15:17:26 iha 1.3.80.1: #i40783# added missing helpids
2004-10-28INTEGRATION: CWS impress20ea (1.2.68); FILE MERGEDPascal Junck1-3/+35
2004/09/28 11:48:31 af 1.2.68.1: #i34606# Added support for master pages.
2004-07-13INTEGRATION: CWS impress2 (1.1.2); FILE ADDEDRüdiger Timm1-0/+200
2004/07/04 13:42:03 af 1.1.2.11: #i22705# Added AddItemForToken() method. 2004/07/02 12:24:12 af 1.1.2.10: #i22705# Added Clear() method. 2004/07/01 11:40:35 af 1.1.2.9: #i22705# Added methods UpdateSelection() and Fill(). 2004/06/23 13:06:16 af 1.1.2.8: #i22705# Removed ::Control base class. The value set is returned now by GetWindow(). 2004/06/09 13:50:51 af 1.1.2.7: #i22705# Code cleanup. 2004/06/08 12:33:57 af 1.1.2.6: #i22705# Converted int to sal_Int32 in ILayoutableWindow interface. Added GetMinimumWidth() function. 2004/06/04 06:14:49 af 1.1.2.5: #i22705# Adaption to new base class TreeNode. Class is now a shell. 2004/05/23 14:01:53 af 1.1.2.4: #i22705# mpPageSet is now an auto pointer. 2004/05/19 13:58:51 af 1.1.2.3: #i22705# Support of ILayoutableWindow. 2004/05/10 09:10:25 af 1.1.2.2: #i22705# Added a PreviewRenderer member. Fixed calculation of required size. 2004/05/05 12:36:31 af 1.1.2.1: #i22705# Initial revision.
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 18:20:33 +0000