Kaydet (Commit) 3530cccd authored tarafından Arnaud Versini's avatar Arnaud Versini Kaydeden (comit) Caolán McNamara

Add non blank characters in Writter properties dialog.

üst 0da39171
...@@ -69,6 +69,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) : ...@@ -69,6 +69,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) :
aParaLbl (this, SW_RES( FT_PARA )), aParaLbl (this, SW_RES( FT_PARA )),
aWordLbl (this, SW_RES( FT_WORD )), aWordLbl (this, SW_RES( FT_WORD )),
aCharLbl (this, SW_RES( FT_CHAR )), aCharLbl (this, SW_RES( FT_CHAR )),
aCharExclSpacesLbl (this, SW_RES( FT_CHAR_EXCL_SPACES )),
aLineLbl (this, SW_RES( FT_LINE )), aLineLbl (this, SW_RES( FT_LINE )),
aTableNo (this, SW_RES( FT_TABLE_COUNT)), aTableNo (this, SW_RES( FT_TABLE_COUNT)),
...@@ -78,6 +79,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) : ...@@ -78,6 +79,7 @@ SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) :
aParaNo (this, SW_RES( FT_PARA_COUNT )), aParaNo (this, SW_RES( FT_PARA_COUNT )),
aWordNo (this, SW_RES( FT_WORD_COUNT )), aWordNo (this, SW_RES( FT_WORD_COUNT )),
aCharNo (this, SW_RES( FT_CHAR_COUNT )), aCharNo (this, SW_RES( FT_CHAR_COUNT )),
aCharExclSpacesNo (this, SW_RES( FT_CHAR_COUNT_EXCL_SPACES )),
aLineNo (this, SW_RES( FT_LINE_COUNT )), aLineNo (this, SW_RES( FT_LINE_COUNT )),
aUpdatePB (this, SW_RES( PB_PDATE )) aUpdatePB (this, SW_RES( PB_PDATE ))
{ {
...@@ -128,6 +130,7 @@ void SwDocStatPage::SetData(const SwDocStat &rStat) ...@@ -128,6 +130,7 @@ void SwDocStatPage::SetData(const SwDocStat &rStat)
aParaNo.SetText(String::CreateFromInt32( rStat.nPara )); aParaNo.SetText(String::CreateFromInt32( rStat.nPara ));
aWordNo.SetText(String::CreateFromInt32( rStat.nWord )); aWordNo.SetText(String::CreateFromInt32( rStat.nWord ));
aCharNo.SetText(String::CreateFromInt32( rStat.nChar )); aCharNo.SetText(String::CreateFromInt32( rStat.nChar ));
aCharExclSpacesNo.SetText(String::CreateFromInt32( rStat.nCharExcludingSpaces ));
} }
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#define FT_PARA 5 #define FT_PARA 5
#define FT_WORD 6 #define FT_WORD 6
#define FT_CHAR 9 #define FT_CHAR 9
#define FT_CHAR_EXCL_SPACES 21
#define FT_TABLE_COUNT 10 #define FT_TABLE_COUNT 10
#define FT_GRF_COUNT 11 #define FT_GRF_COUNT 11
#define FT_OLE_COUNT 12 #define FT_OLE_COUNT 12
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
#define FT_PARA_COUNT 14 #define FT_PARA_COUNT 14
#define FT_WORD_COUNT 15 #define FT_WORD_COUNT 15
#define FT_CHAR_COUNT 16 #define FT_CHAR_COUNT 16
#define FT_CHAR_COUNT_EXCL_SPACES 20
#define FT_LINE 17 #define FT_LINE 17
#define FT_LINE_COUNT 18 #define FT_LINE_COUNT 18
#define PB_PDATE 19 #define PB_PDATE 19
......
...@@ -83,64 +83,77 @@ TabPage TP_DOC_STAT ...@@ -83,64 +83,77 @@ TabPage TP_DOC_STAT
Text [ en-US ] = "Number of Characters:" ; Text [ en-US ] = "Number of Characters:" ;
Left = TRUE ; Left = TRUE ;
}; };
FixedText FT_LINE FixedText FT_CHAR_EXCL_SPACES
{ {
Pos = MAP_APPFONT ( 6 , 96 ) ; Pos = MAP_APPFONT ( 6 , 96 ) ;
Size = MAP_APPFONT ( 138 , 8 ) ;
Text [ en-US ] = "Number of non blank Characters:" ;
Left = TRUE ;
};
FixedText FT_LINE
{
Pos = MAP_APPFONT ( 6 , 110 ) ;
Size = MAP_APPFONT ( 90 , 8 ) ; Size = MAP_APPFONT ( 90 , 8 ) ;
Text [ en-US ] = "Number of Lines:" ; Text [ en-US ] = "Number of Lines:" ;
}; };
FixedText FT_PAGE_COUNT FixedText FT_PAGE_COUNT
{ {
Pos = MAP_APPFONT ( 114 , 6 ) ; Pos = MAP_APPFONT ( 138 , 6 ) ;
Size = MAP_APPFONT ( 27 , 8 ) ; Size = MAP_APPFONT ( 27 , 8 ) ;
Left = TRUE ; Left = TRUE ;
}; };
FixedText FT_TABLE_COUNT FixedText FT_TABLE_COUNT
{ {
Pos = MAP_APPFONT ( 114 , 18 ) ; Pos = MAP_APPFONT ( 138 , 18 ) ;
Size = MAP_APPFONT ( 27 , 8 ) ; Size = MAP_APPFONT ( 27 , 8 ) ;
Left = TRUE ; Left = TRUE ;
}; };
FixedText FT_GRF_COUNT FixedText FT_GRF_COUNT
{ {
Pos = MAP_APPFONT ( 114 , 30 ) ; Pos = MAP_APPFONT ( 138 , 30 ) ;
Size = MAP_APPFONT ( 27 , 8 ) ; Size = MAP_APPFONT ( 27 , 8 ) ;
Left = TRUE ; Left = TRUE ;
}; };
FixedText FT_OLE_COUNT FixedText FT_OLE_COUNT
{ {
Pos = MAP_APPFONT ( 114 , 42 ) ; Pos = MAP_APPFONT ( 138 , 42 ) ;
Size = MAP_APPFONT ( 27 , 8 ) ; Size = MAP_APPFONT ( 27 , 8 ) ;
Left = TRUE ; Left = TRUE ;
}; };
FixedText FT_PARA_COUNT FixedText FT_PARA_COUNT
{ {
Pos = MAP_APPFONT ( 114 , 54 ) ; Pos = MAP_APPFONT ( 138 , 54 ) ;
Size = MAP_APPFONT ( 27 , 8 ) ; Size = MAP_APPFONT ( 27 , 8 ) ;
Left = TRUE ; Left = TRUE ;
}; };
FixedText FT_WORD_COUNT FixedText FT_WORD_COUNT
{ {
Pos = MAP_APPFONT ( 114 , 68 ) ; Pos = MAP_APPFONT ( 138 , 68 ) ;
Size = MAP_APPFONT ( 27 , 8 ) ; Size = MAP_APPFONT ( 27 , 8 ) ;
Left = TRUE ; Left = TRUE ;
}; };
FixedText FT_CHAR_COUNT FixedText FT_CHAR_COUNT
{ {
Pos = MAP_APPFONT ( 114 , 82 ) ; Pos = MAP_APPFONT ( 138 , 82 ) ;
Size = MAP_APPFONT ( 27 , 8 ) ;
Left = TRUE ;
};
FixedText FT_CHAR_COUNT_EXCL_SPACES
{
Pos = MAP_APPFONT ( 138 , 96 ) ;
Size = MAP_APPFONT ( 27 , 8 ) ; Size = MAP_APPFONT ( 27 , 8 ) ;
Left = TRUE ; Left = TRUE ;
}; };
FixedText FT_LINE_COUNT FixedText FT_LINE_COUNT
{ {
Pos = MAP_APPFONT ( 114 , 96 ) ; Pos = MAP_APPFONT ( 138 , 110 ) ;
Size = MAP_APPFONT ( 27 , 8 ) ; Size = MAP_APPFONT ( 27 , 8 ) ;
Left = TRUE ; Left = TRUE ;
Text = "..." ; Text = "..." ;
}; };
PushButton PB_PDATE PushButton PB_PDATE
{ {
Pos = MAP_APPFONT ( 204 , 94 ) ; Pos = MAP_APPFONT ( 204 , 108 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Update" ; Text [ en-US ] = "~Update" ;
}; };
......
...@@ -60,6 +60,7 @@ private: ...@@ -60,6 +60,7 @@ private:
FixedText aParaLbl; FixedText aParaLbl;
FixedText aWordLbl; FixedText aWordLbl;
FixedText aCharLbl; FixedText aCharLbl;
FixedText aCharExclSpacesLbl;
FixedText aLineLbl; FixedText aLineLbl;
FixedInfo aTableNo; FixedInfo aTableNo;
...@@ -69,6 +70,7 @@ private: ...@@ -69,6 +70,7 @@ private:
FixedInfo aParaNo; FixedInfo aParaNo;
FixedInfo aWordNo; FixedInfo aWordNo;
FixedInfo aCharNo; FixedInfo aCharNo;
FixedInfo aCharExclSpacesNo;
FixedInfo aLineNo; FixedInfo aLineNo;
PushButton aUpdatePB; PushButton aUpdatePB;
......
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