summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/app/AppSwapWindow.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:02:56 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:02:56 +0200
commitfdc4da32a09265b19470ab09db998ea28936106e (patch)
tree960b32cda2755f988d0d34e568f1019ad2bce0d2 /dbaccess/source/ui/app/AppSwapWindow.hxx
parentaa20084bd041208841d5ad3ca50b1e963eb5986e (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit e082905e4ce8c9018a2a38035e212eb45e9f70b1 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:14 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 35131d5a73dd02924bf4b404c55d0dbeb324db1f Author: Lionel Elie Mamane <lionel@mamane.lu> Date: Sat Jan 15 05:39:40 2011 +0100 i#116187: report left/right page margin setting ignored on Unix 64 bit (cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a) Signed-off-by: Michael Meeks <michael.meeks@novell.com> reportdesign/source/ui/report/ReportController.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit ae3903b548d8d05807cc7f3a029495388de5e302 Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:24:43 2011 -0500 Remove the Registration... menu item which we don't want. (fdo#33112) dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit c71822d4eb36b43cdb08c25d207cae5e3c1660cd Author: Noel Power <noel.power@novell.com> Date: Wed Jan 12 11:09:51 2011 +0000 fix for fdo#32742# reportdesign/source/ui/inspection/metadata.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 66d25b635de422a4a811710cb3289266d9a11a84 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:35 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
Notes: split repo tag: base_libreoffice-3.3.0.4
Diffstat (limited to 'dbaccess/source/ui/app/AppSwapWindow.hxx')
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.hxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index bc5cd2abb1df..2ef77e73ab7d 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -37,16 +37,16 @@ namespace dbaui
{
class OAppBorderWindow;
//==================================================================
- class OApplicationSwapWindow : public Window,
+ class OApplicationSwapWindow : public Window,
public IClipboardTest
{
- OApplicationIconControl m_aIconControl;
- ElementType m_eLastType;
- OAppBorderWindow& m_rBorderWin;
+ OApplicationIconControl m_aIconControl;
+ ElementType m_eLastType;
+ OAppBorderWindow& m_rBorderWin;
void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
- DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* );
+ DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* );
DECL_LINK( ChangeToLastSelected, void* );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt);
@@ -57,17 +57,17 @@ namespace dbaui
virtual void Resize();
- inline sal_Bool isCutAllowed() { return sal_False; }
- inline sal_Bool isCopyAllowed() { return sal_False; }
- inline sal_Bool isPasteAllowed() { return sal_False; }
+ inline sal_Bool isCutAllowed() { return sal_False; }
+ inline sal_Bool isCopyAllowed() { return sal_False; }
+ inline sal_Bool isPasteAllowed() { return sal_False; }
virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); }
- inline void copy() { }
- inline void cut() { }
- inline void paste() { }
+ inline void copy() { }
+ inline void cut() { }
+ inline void paste() { }
- inline ULONG GetEntryCount() const { return m_aIconControl.GetEntryCount(); }
- inline SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); }
- inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); }
+ inline ULONG GetEntryCount() const { return m_aIconControl.GetEntryCount(); }
+ inline SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); }
+ inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); }
/** automatically creates mnemonics for the icon/texts in our left hand side panel
*/
@@ -90,7 +90,7 @@ namespace dbaui
void clearSelection();
/** changes the container which should be displayed. The select handler will also be called.
- @param _eType
+ @param _eType
Which container to show.
*/
void selectContainer(ElementType _eType);