summaryrefslogtreecommitdiff
path: root/sw/source/ui/dialog/ascfldlg.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:25:01 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:25:01 +0200
commit002c16ce95fa6e384e7541b6e656b9058dd9b459 (patch)
treec713903d39a6fa16db64fcf311b7b09a09528cfa /sw/source/ui/dialog/ascfldlg.cxx
parent870bf01177cda3e80d200b785040e0ebe248b263 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 884b525da5856cbd2c4a382e73327d8c59a91acc (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:09 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit b59804d94e107c5227532aa3511d4fad1dd15436 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Mar 18 17:47:27 2011 +0100 Related: fdo#32553/fdo#31792 nsure correct odt mimetype and pdf export filter Signed-off-by: Petr Mladek <pmladek@suse.cz> sw/source/ui/dbui/mmoutputpage.cxx | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) commit d1234b1bcd542b4ce523b6be76e7491afdce4de8 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Mar 18 12:29:41 2011 +0000 Resolves: fdo#32553 freeze/hang on mailmerge to attached pdf Signed-off-by: Petr Mladek <pmladek@suse.cz> sw/source/core/docnode/nodes.cxx | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) commit 5974be757044982b8f510c5fc642e8e03ae62c74 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Mar 8 16:32:57 2011 +0100 n#663622: Fix the positions of imported fields to avoid crashes Signed-off-by: Petr Mladek <pmladek@suse.cz> sw/source/core/crsr/bookmrk.cxx | 2 +- sw/source/core/inc/bookmrk.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Notes
split repo tag: writer_libreoffice-3.3.3.1
Diffstat (limited to 'sw/source/ui/dialog/ascfldlg.cxx')
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx40
1 files changed, 20 insertions, 20 deletions
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 131884d562eb..28e96386b82f 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -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
@@ -61,7 +61,7 @@ using namespace ::com::sun::star;
const sal_Unicode cDialogExtraDataClose = '}';
const char __FAR_DATA sDialogImpExtraData[] = "EncImpDlg:{";
const char __FAR_DATA sDialogExpExtraData[] = "EncExpDlg:{";
-const USHORT nDialogExtraDataLen = 11; // 12345678901
+const USHORT nDialogExtraDataLen = 11; // 12345678901
SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
SvStream* pStream )
@@ -125,12 +125,12 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
for( USHORT nCnt = 0; nCnt < nBytesRead; ++nCnt )
switch( aBuffer[ nCnt ] )
{
- case 0x0: bNullChar = TRUE; break;
- case 0xA: bLF = TRUE; break;
- case 0xD: bCR = TRUE; break;
+ case 0x0: bNullChar = TRUE; break;
+ case 0xA: bLF = TRUE; break;
+ case 0xD: bCR = TRUE; break;
case 0xC:
case 0x1A:
- case 0x9: break;
+ case 0x9: break;
default:
if( 0x20 > aBuffer[ nCnt ] )
bNoNormalChar = TRUE;
@@ -144,20 +144,20 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
{
aOpt.SetParaFlags( LINEEND_CRLF );
// have to check if of CharSet is type of ANSI
-// aOpt.SetCharSet( CHARSET_ANSI );
+// aOpt.SetCharSet( CHARSET_ANSI );
}
else
{
aOpt.SetParaFlags( LINEEND_CR );
// have to check if CharSet is type of MAC
-// aOpt.SetCharSet( CHARSET_MAC );
+// aOpt.SetCharSet( CHARSET_MAC );
}
}
else if( bLF )
{
aOpt.SetParaFlags( LINEEND_LF );
// have to check if of CharSet is type of ANSI
-// aOpt.SetCharSet( CHARSET_ANSI );
+// aOpt.SetCharSet( CHARSET_ANSI );
}
}
@@ -256,16 +256,16 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh,
aLanguageLB.Hide();
long nY = aFontFT.GetPosPixel().Y() + 1;
- Point aPos( aCRLF_FT.GetPosPixel() ); aPos.Y() = nY;
+ Point aPos( aCRLF_FT.GetPosPixel() ); aPos.Y() = nY;
aCRLF_FT.SetPosPixel( aPos );
- aPos = aCRLF_RB.GetPosPixel(); aPos.Y() = nY;
+ aPos = aCRLF_RB.GetPosPixel(); aPos.Y() = nY;
aCRLF_RB.SetPosPixel( aPos );
- aPos = aCR_RB.GetPosPixel(); aPos.Y() = nY;
+ aPos = aCR_RB.GetPosPixel(); aPos.Y() = nY;
aCR_RB.SetPosPixel( aPos );
- aPos = aLF_RB.GetPosPixel(); aPos.Y() = nY;
+ aPos = aLF_RB.GetPosPixel(); aPos.Y() = nY;
aLF_RB.SetPosPixel( aPos );
Size aSize = GetSizePixel();
@@ -343,9 +343,9 @@ void SwAsciiFilterDlg::SetCRLF( LineEnd eEnd )
{
switch( eEnd )
{
- case LINEEND_CR: aCR_RB.Check(); break;
- case LINEEND_CRLF: aCRLF_RB.Check(); break;
- case LINEEND_LF: aLF_RB.Check(); break;
+ case LINEEND_CR: aCR_RB.Check(); break;
+ case LINEEND_CRLF: aCRLF_RB.Check(); break;
+ case LINEEND_LF: aLF_RB.Check(); break;
}
}
@@ -380,15 +380,15 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, SvxTextEncodingBox*, pBox )
#ifdef UNX
eEnd = LINEEND_LF;
#else
- eEnd = LINEEND_CRLF; // ANSI
+ eEnd = LINEEND_CRLF; // ANSI
#endif
break;
- case RTL_TEXTENCODING_APPLE_ROMAN: // MAC
+ case RTL_TEXTENCODING_APPLE_ROMAN: // MAC
eEnd = LINEEND_CR;
break;
- case RTL_TEXTENCODING_IBM_850: // DOS
+ case RTL_TEXTENCODING_IBM_850: // DOS
eEnd = LINEEND_CRLF;
break;
@@ -417,7 +417,7 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, SvxTextEncodingBox*, pBox )
}
bSaveLineStatus = FALSE;
- if( eEnd != (LineEnd)-1 ) // changed?
+ if( eEnd != (LineEnd)-1 ) // changed?
{
if( eOldEnd != eEnd )
SetCRLF( eEnd );