Skip to content

C
core
Kaydet (Commit) 229ba149 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien
Dosyalara gözat
Seçenekler

#i10000# fix merge resolution problem

üst ea0ed1f4
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
svx/source/dialog/textattr.hxx
Dosyayı görüntüle @ 229ba149
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: textattr.hxx,v $ * $RCSfile: textattr.hxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: hr $ $Date: 2004-05-10 16:55:30 $ * last change: $Author: hr $ $Date: 2004-05-12 12:14:56 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -95,6 +95,9 @@ private: ...@@ -95,6 +95,9 @@ private:
TriStateBox aTsbAutoGrowHeight; TriStateBox aTsbAutoGrowHeight;
TriStateBox aTsbFitToSize; TriStateBox aTsbFitToSize;
TriStateBox aTsbContour; TriStateBox aTsbContour;
TriStateBox aTsbWordWrapText;
TriStateBox aTsbAutoGrowSize;
FixedLine aFlDistance; FixedLine aFlDistance;
FixedText aFtLeft; FixedText aFtLeft;
...@@ -117,6 +120,11 @@ private: ...@@ -117,6 +120,11 @@ private:
BOOL bAutoGrowSizeEnabled; BOOL bAutoGrowSizeEnabled;
BOOL bContourEnabled; BOOL bContourEnabled;
BOOL bAutoGrowWidthEnabled;
BOOL bAutoGrowHeightEnabled;
BOOL bWordWrapTextEnabled;
BOOL bFitToSizeEnabled;
#ifdef _SVX_TEXTATTR_CXX #ifdef _SVX_TEXTATTR_CXX
DECL_LINK( ClickFullWidthHdl_Impl, void * ); DECL_LINK( ClickFullWidthHdl_Impl, void * );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment