summaryrefslogtreecommitdiff
path: root/sw/inc/swtable.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:23 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:23 +0200
commitf6fbd3173fd322ee1382ec3ac93c0d9daa03f9f3 (patch)
treeeeec54a98deecb420e00351f2499cf5ed3815abd /sw/inc/swtable.hxx
parentef599bd8ed7aba0240e0d7a4c3f9b744044d34b4 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit bb2d8bb585f9c91b8ce3a9e0317b6987f5e95ef4 (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:46 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit f58dcf55d8fca8240c459f74b8e819a5a3dda6d4 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:31 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 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. commit 8ab96261731432608bbcf733775a4fc84afa75e5 Author: Noel Power <noel.power@novell.com> Date: Mon Feb 7 12:02:12 2011 +0000 fix for bnc#655763 cherry picked from 7c85cd305fcfaa4d714d5d83a7a1f22000a57a8f reviewed in bug https://bugzilla.novell.com/show_bug.cgi?id=655763#c6 Signed-off-by: Cedric Bosdonnat <cbosdonnat@novell.com> sw/source/core/unocore/unotext.cxx | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) commit 5632452090c2cf97e1700abb41684ceab4d04839 Author: Caolán McNamara <caolanm@redhat.com> Date: Thu Nov 11 13:31:33 2010 +0000 Resolves: #i25247#, #i25561#, #i48064#, #i92341# CTL/Other Default Font Signed-off-by: Cédric Bosdonnat <cedricbosdo@openoffice.org> sw/source/filter/ww8/ww8par2.cxx | 19 ++++--------------- sw/source/filter/ww8/ww8par6.cxx | 12 ++++++------ sw/source/filter/ww8/ww8scan.cxx | 17 +++++++++++------ sw/source/filter/ww8/ww8scan.hxx | 8 +++++--- 4 files changed, 26 insertions(+), 30 deletions(-) commit b36353099d6c2518fcbe0c86e1254249b7114650 Author: Petr Mladek <pmladek@suse.cz> Date: Wed Feb 2 17:06:01 2011 +0100 RTF export crasher (bnc#656503) Signed off by Cedric sw/source/filter/ww8/wrtw8nds.cxx | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit b61d4e3e3d519672f908f87ad1987b02cf14c40e Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Thu Nov 18 12:37:58 2010 +0100 Fixed an infinite loop while exporting some files in doc/docx/rtf sw/source/filter/ww8/wrtww8.hxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 60fc5e3665587389888e83c8970f1f216a72efbc Author: Andras Timar <timar@fsf.hu> Date: Tue Jan 25 21:14:53 2011 +0100 translations need more space on word count dialog sw/source/ui/dialog/wordcountdialog.src | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 8b28483538dc426475d651687b5505cf94149d22 Author: Noel Power <noel.power@novell.com> Date: Mon Jan 10 15:23:27 2011 +0000 bnc#660816 improve formfield checkbox binary export ( and import ) sw/source/core/crsr/bookmrk.cxx | 8 ++++++++ sw/source/filter/ww8/wrtww8.cxx | 37 +++++++++++++++++++++---------------- sw/source/filter/ww8/ww8par3.cxx | 2 ++ 3 files changed, 31 insertions(+), 16 deletions(-) commit 866e4b44f7d5ea75ba31ad78b6c8b58067627788 Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:54:40 2011 -0500 Remove pesky on-line registration menu entry. (fdo#33112) sw/uiconfig/swform/menubar/menubar.xml | 1 - sw/uiconfig/swreport/menubar/menubar.xml | 1 - sw/uiconfig/swxform/menubar/menubar.xml | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) commit 0bc34a89434f97f5c25fae9d3529c292aba8e9e6 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Jan 14 11:44:23 2011 +0000 Resolves: fdo#32633 use standard Edit button width of 50 (cherry picked from commit a3c9ea96b2deee09060fae80d673e262b27872bb) sw/source/ui/misc/titlepage.src | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 6d54edb9fa96fd915a90b06886781827acd2fcde Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jan 11 20:33:41 2011 +0000 fix this to build sw/source/core/crsr/pam.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 8d9cf3fdfda0bf4b2ae2464edc0397b0e296f015 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Jan 11 20:18:26 2011 +0100 n#657135: Enhanced fields fixes (key inputs, and 0-length fields import) sw/source/core/crsr/bookmrk.cxx | 2 +- sw/source/core/crsr/pam.cxx | 5 +++-- sw/source/filter/ww8/wrtw8nds.cxx | 6 +++--- sw/source/filter/ww8/ww8scan.hxx | 2 +- sw/source/ui/docvw/edtwin.cxx | 19 ++++++++++++++++--- 5 files changed, 24 insertions(+), 10 deletions(-) commit bc6fea9e91ce63236322a1725a725f7fb98aab47 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:58 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit a6d2bb18dd88894c92080214ff7a5c6178ad92cc Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:10 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
split repo tag: writer_libreoffice-3.3.1.1
Diffstat (limited to 'sw/inc/swtable.hxx')
-rw-r--r--sw/inc/swtable.hxx60
1 files changed, 30 insertions, 30 deletions
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 0dad43843d84..f4cedacda69d 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.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
@@ -40,7 +40,7 @@ class SwStartNode;
#include <memory>
#include <boost/noncopyable.hpp>
#else
-#include <node.hxx> // fuer StartNode->GetMyIndex
+#include <node.hxx> // fuer StartNode->GetMyIndex
#endif
class Color;
@@ -84,14 +84,14 @@ typedef SwTableBox* SwTableBoxPtr;
SV_DECL_PTRARR_SORT( SwTableSortBoxes, SwTableBoxPtr, 25, 50 )
typedef SwTableLine* SwTableLinePtr;
-class SW_DLLPUBLIC SwTable: public SwClient //Client vom FrmFmt
+class SW_DLLPUBLIC SwTable: public SwClient //Client vom FrmFmt
{
using SwClient::IsModifyLocked;
protected:
SwTableLines aLines;
SwTableSortBoxes aSortCntBoxes;
- SwServerObjectRef refObj; // falls DataServer -> Pointer gesetzt
+ SwServerObjectRef refObj; // falls DataServer -> Pointer gesetzt
SwHTMLTableLayout *pHTMLLayout;
@@ -102,13 +102,13 @@ protected:
SwTableNode* pTableNode;
//SOLL das fuer jede Tabelle einstellbar sein?
- TblChgMode eTblChgMode;
+ TblChgMode eTblChgMode;
- USHORT nGrfsThatResize; // Anzahl der Grfs, die beim HTML-Import
+ USHORT nGrfsThatResize; // Anzahl der Grfs, die beim HTML-Import
// noch ein Resize der Tbl. anstossen
USHORT nRowsToRepeat; // number of rows to repeat on every page
- BOOL bModifyLocked :1;
+ BOOL bModifyLocked :1;
BOOL bNewModel :1; // FALSE: old SubTableModel; TRUE: new RowSpanModel
#if OSL_DEBUG_LEVEL > 1
bool bDontChangeModel; // This is set by functions (like Merge()) to forbid a laet model change
@@ -120,7 +120,7 @@ public:
enum SearchType
{
SEARCH_NONE, // Default: expand to rectangle
- SEARCH_ROW, // row selection
+ SEARCH_ROW, // row selection
SEARCH_COL // column selection
};
@@ -131,7 +131,7 @@ public:
virtual ~SwTable();
// @@@ public copy ctor, but no copy assignment?
- SwTable( const SwTable& rTable ); // kein Copy der Lines !!
+ SwTable( const SwTable& rTable ); // kein Copy der Lines !!
private:
// @@@ public copy ctor, but no copy assignment?
SwTable & operator= (const SwTable &);
@@ -144,7 +144,7 @@ private:
BOOL NewSplitRow( SwDoc*, const SwSelBoxes&, USHORT, BOOL );
SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const;
void InsertSpannedRow( SwDoc* pDoc, USHORT nIdx, USHORT nCnt );
- BOOL _InsertRow( SwDoc*, const SwSelBoxes&, USHORT nCnt, BOOL bBehind );
+ BOOL _InsertRow( SwDoc*, const SwSelBoxes&, USHORT nCnt, BOOL bBehind );
BOOL NewInsertCol( SwDoc*, const SwSelBoxes& rBoxes, USHORT nCnt, BOOL );
void _FindSuperfluousRows( SwSelBoxes& rBoxes, SwTableLine*, SwTableLine* );
void AdjustWidths( const long nOld, const long nNew );
@@ -155,13 +155,13 @@ public:
SwHTMLTableLayout *GetHTMLTableLayout() { return pHTMLLayout; }
const SwHTMLTableLayout *GetHTMLTableLayout() const { return pHTMLLayout; }
- void SetHTMLTableLayout( SwHTMLTableLayout *p ); //Eigentumsuebergang!
+ void SetHTMLTableLayout( SwHTMLTableLayout *p ); //Eigentumsuebergang!
USHORT IncGrfsThatResize() { return ++nGrfsThatResize; }
USHORT DecGrfsThatResize() { return nGrfsThatResize ? --nGrfsThatResize : 0; }
- void LockModify() { bModifyLocked = TRUE; } //Muessen _immer_ paarig
- void UnlockModify() { bModifyLocked = FALSE;} //benutzt werden!
+ void LockModify() { bModifyLocked = TRUE; } //Muessen _immer_ paarig
+ void UnlockModify() { bModifyLocked = FALSE;} //benutzt werden!
void SetTableModel( BOOL bNew ){ bNewModel = bNew; }
BOOL IsNewModel() const { return bNewModel; }
@@ -175,8 +175,8 @@ public:
SwTableLines &GetTabLines() { return aLines; }
const SwTableLines &GetTabLines() const { return aLines; }
- SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
- SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
@@ -245,7 +245,7 @@ public:
{ _FindSuperfluousRows( rBoxes, 0, 0 ); }
void CheckRowSpan( SwTableLinePtr &rpLine, bool bUp ) const;
- SwTableSortBoxes& GetTabSortBoxes() { return aSortCntBoxes; }
+ SwTableSortBoxes& GetTabSortBoxes() { return aSortCntBoxes; }
const SwTableSortBoxes& GetTabSortBoxes() const { return aSortCntBoxes; }
// lese die 1. Nummer und loesche sie aus dem String
@@ -279,7 +279,7 @@ public:
// erfrage die Box, dessen Start-Index auf nBoxStt steht
SwTableBox* GetTblBox( ULONG nSttIdx );
const SwTableBox* GetTblBox( ULONG nSttIdx ) const
- { return ((SwTable*)this)->GetTblBox( nSttIdx ); }
+ { return ((SwTable*)this)->GetTblBox( nSttIdx ); }
// returnt TRUE wenn sich in der Tabelle Verschachtelungen befinden
BOOL IsTblComplex() const;
@@ -291,7 +291,7 @@ public:
// suche alle Inhaltstragenden-Boxen der Grundline in der diese Box
// steht. rBoxes auch als Return-Wert, um es gleich weiter zu benutzen
//JP 31.01.97: bToTop = TRUE -> hoch bis zur Grundline,
- // FALSE-> sonst nur die Line der Box
+ // FALSE-> sonst nur die Line der Box
SwSelBoxes& SelLineFromBox( const SwTableBox* pBox,
SwSelBoxes& rBoxes, BOOL bToTop = TRUE ) const;
// erfrage vom Client Informationen
@@ -315,8 +315,8 @@ public:
//Daten fuer das Chart fuellen.
void UpdateCharts() const;
- TblChgMode GetTblChgMode() const { return eTblChgMode; }
- void SetTblChgMode( TblChgMode eMode ) { eTblChgMode = eMode; }
+ TblChgMode GetTblChgMode() const { return eTblChgMode; }
+ void SetTblChgMode( TblChgMode eMode ) { eTblChgMode = eMode; }
BOOL SetColWidth( SwTableBox& rAktBox, USHORT eType,
SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
@@ -327,7 +327,7 @@ public:
#endif
};
-class SW_DLLPUBLIC SwTableLine: public SwClient // Client vom FrmFmt
+class SW_DLLPUBLIC SwTableLine: public SwClient // Client vom FrmFmt
{
SwTableBoxes aBoxes;
SwTableBox *pUpper;
@@ -348,8 +348,8 @@ public:
void SetUpper( SwTableBox *pNew ) { pUpper = pNew; }
- SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
- SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
//Macht ein eingenes FrmFmt wenn noch mehr Lines von ihm abhaengen.
SwFrmFmt* ClaimFrmFmt();
@@ -366,15 +366,15 @@ public:
bool hasSoftPageBreak() const;
};
-class SW_DLLPUBLIC SwTableBox: public SwClient //Client vom FrmFmt
+class SW_DLLPUBLIC SwTableBox: public SwClient //Client vom FrmFmt
{
- friend class SwNodes; // um den Index umzusetzen !
+ friend class SwNodes; // um den Index umzusetzen !
friend void DelBoxNode(SwTableSortBoxes&); // um den StartNode* zu loeschen !
friend class SwXMLTableContext;
//nicht (mehr) implementiert.
SwTableBox( const SwTableBox & );
- SwTableBox &operator=( const SwTableBox &); //gibts nicht.
+ SwTableBox &operator=( const SwTableBox &); //gibts nicht.
SwTableLines aLines;
const SwStartNode * pSttNd;
@@ -402,8 +402,8 @@ public:
const SwTableLine *GetUpper() const { return pUpper; }
void SetUpper( SwTableLine *pNew ) { pUpper = pNew; }
- SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
- SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() { return (SwFrmFmt*)pRegisteredIn; }
+ SwFrmFmt* GetFrmFmt() const { return (SwFrmFmt*)pRegisteredIn; }
//Macht ein eingenes FrmFmt wenn noch mehr Boxen von ihm abhaengen.
SwFrmFmt* ClaimFrmFmt();
@@ -449,7 +449,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwTableBox)
// zugriff auf interne Daten - z.Z. benutzt fuer den NumFormatter
- inline const Color* GetSaveUserColor() const;
+ inline const Color* GetSaveUserColor() const;
inline const Color* GetSaveNumFmtColor() const;
inline void SetSaveUserColor(const Color* p );
inline void SetSaveNumFmtColor( const Color* p );
@@ -487,6 +487,6 @@ public:
const SwTableBox * getTableBox() const;
};
-#endif //_SWTABLE_HXX
+#endif //_SWTABLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */