[Libreoffice-commits] .: 23 commits - sw/source sw/uiconfig
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Feb 7 17:19:57 PST 2011
sw/source/core/crsr/bookmrk.cxx | 3 +--
sw/source/core/doc/doc.cxx | 7 ++-----
sw/source/filter/ww8/wrtw8nds.cxx | 5 +++--
sw/uiconfig/swform/menubar/menubar.xml | 1 -
sw/uiconfig/swreport/menubar/menubar.xml | 1 -
sw/uiconfig/swxform/menubar/menubar.xml | 1 -
6 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit 0489c562f531dc5f776ffaeed231a2e7d564e8d1
Merge: 294292d... 8ab9626...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Feb 8 00:28:53 2011 +0100
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
sw/source/core/crsr/bookmrk.cxx
sw/source/core/doc/doc.cxx
sw/source/filter/ww8/ww8par2.cxx
sw/source/filter/ww8/ww8par6.cxx
sw/source/ui/dbui/mmoutputpage.cxx
diff --cc sw/source/core/crsr/bookmrk.cxx
index c032664,0641e96..2c38982
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@@ -333,9 -335,9 +333,8 @@@ namespace sw { namespace mar
}
void CheckboxFieldmark::SetChecked(bool checked)
{
- bool bOld( IsChecked() );
- (*GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMCHECKBOX_RESULT)] = makeAny(checked);
- bool bOld( IsChecked() );
- if ( bOld != checked )
+ (*GetParameters())[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMCHECKBOX_RESULT))] = makeAny(checked);
- if ( bOld != checked )
++ if ( IsChecked() != checked )
{
// mark document as modified
SwDoc *const pDoc( GetMarkPos().GetDoc() );
diff --cc sw/source/core/doc/doc.cxx
index 18df128,7221f6a..17cc186
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@@ -1330,11 -1339,8 +1330,8 @@@ void SwDoc::CalculatePagesForPrinting
// get PageRange value to use
OUString aPageRange;
- if (bIsPDFExport)
- {
- aPageRange = rOptions.getStringValue( "PageRange", OUString() );
- }
- else
- // PL, OD #i116085# - adjusting fix for i113919
++ // #i116085# - adjusting fix for i113919
+ if ( !bIsPDFExport )
{
// PageContent :
// 0 -> print all pages (default if aPageRange is empty)
commit 8ab96261731432608bbcf733775a4fc84afa75e5
Author: Noel Power <noel.power at 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 at novell.com>
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 4c33dce..05c50fd 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1654,11 +1654,20 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
SfxItemSet aFrameItemSet(m_pImpl->m_pDoc->GetAttrPool(),
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
0 );
-
+ // If there is no content in the frame the shape is in
+ // it gets deleted in the DelFullPara call below,
+ // In this case insert a tmp text node ( we delete it later )
+ if ( aStartPam.Start()->nNode == pEndPam->Start()->nNode
+ && aStartPam.End()->nNode == pEndPam->End()->nNode )
+ {
+ SwPosition aEnd(*aStartPam.End());
+ bParaAfterInserted = GetDoc()->AppendTxtNode( aEnd );
+ pEndPam->DeleteMark();
+ *pEndPam->GetPoint() = aEnd;
+ }
aStartPam.SetMark();
*aStartPam.End() = *pEndPam->End();
pEndPam.reset(0);
-
SwXTextFrame *const pNewFrame = new SwXTextFrame(m_pImpl->m_pDoc);
const uno::Reference< text::XTextFrame > xNewFrame = pNewFrame;
pNewFrame->SetSelection( aStartPam );
commit 5632452090c2cf97e1700abb41684ceab4d04839
Author: Caolán McNamara <caolanm at 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 at openoffice.org>
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index dbadd0c..d5a73b9 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3920,28 +3920,17 @@ WW8RStyle::WW8RStyle(WW8Fib& _rFib, SwWW8ImplReader* pI)
void WW8RStyle::Set1StyleDefaults()
{
+ // see #i25247#, #i25561#, #i48064#, #i92341# for default font
if (!bCJKFontChanged) // Style no CJK Font? set the default
- pIo->SetNewFontAttr(ftcStandardChpCJKStsh, true, RES_CHRATR_CJK_FONT);
-
- // see i25247
- const WW8_FFN* pF = pIo->pFonts->GetFont(3);
- if (pF)
- {
- rtl_TextEncoding eEnc = WW8Fib::GetFIBCharset(pF->chs);
- if ((ftcStandardChpCTLStsh == 0) && (eEnc == RTL_TEXTENCODING_MS_1255))
- ftcStandardChpCTLStsh = 3;
- }
-
- if (ftcStandardChpCJKStsh == 0)
- ftcStandardChpCJKStsh = 2;
+ pIo->SetNewFontAttr(ftcFE, true, RES_CHRATR_CJK_FONT);
if (!bCTLFontChanged) // Style no CTL Font? set the default
- pIo->SetNewFontAttr(ftcStandardChpCTLStsh, true, RES_CHRATR_CTL_FONT);
+ pIo->SetNewFontAttr(ftcBi, true, RES_CHRATR_CTL_FONT);
//#88976# western 2nd to make western charset conversion the default
if (!bFontChanged) // Style has no Font? set the default,
{
- pIo->SetNewFontAttr(ftcStandardChpStsh, true, RES_CHRATR_FONT);
+ pIo->SetNewFontAttr(ftcAsci, true, RES_CHRATR_FONT);
/* removed by a patch from cmc for #i52786#
if (pIo->bVer67)
SetStyleCharSet(pIo->pCollA[pIo->nAktColl]);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 937fdca..5f4ffd4 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3690,18 +3690,18 @@ void SwWW8ImplReader::Read_FontCode( USHORT nId, const BYTE* pData, short nLen )
{ // (siehe sprmCSymbol) gesetzte Font !
switch( nId )
{
- // case 0x4a51: //font to bias towards all else being equal ?
case 113:
- case 0x4a5E:
+ case 0x4A51: //"Other" font, override with BiDi if it exists
+ case 0x4A5E: //BiDi Font
nId = RES_CHRATR_CTL_FONT;
break;
case 93:
case 111:
- case 0x4a4f:
+ case 0x4A4f:
nId = RES_CHRATR_FONT;
break;
case 112:
- case 0x4a50:
+ case 0x4A50:
nId = RES_CHRATR_CJK_FONT;
break;
default:
@@ -5916,8 +5916,8 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
{0x085B, 0}, //"sprmCFDiacColor"
{0x085C, &SwWW8ImplReader::Read_BoldBiDiUsw},//"sprmCFBoldBi"
{0x085D, &SwWW8ImplReader::Read_BoldBiDiUsw},//"sprmCFItalicBi"
- {0x4A5E, &SwWW8ImplReader::Read_FontCode},
- {0x485F, &SwWW8ImplReader::Read_Language}, // "sprmCLidBi"
+ {0x4A5E, &SwWW8ImplReader::Read_FontCode}, //"sprmCFtcBi"
+ {0x485F, &SwWW8ImplReader::Read_Language}, //"sprmCLidBi"
//0x4A60, ? ? ?, //"sprmCIcoBi",
{0x4A61, &SwWW8ImplReader::Read_FontSize}, //"sprmCHpsBi"
{0xCA62, 0}, //"sprmCDispFldRMark"
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 653595a..f781e01 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -6004,7 +6004,7 @@ rtl_TextEncoding WW8Fib::GetFIBCharset(UINT16 chs)
WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
: rFib(rFibPara), rSt(rStream), cstd(0), cbSTDBaseInFile(0),
stiMaxWhenSaved(0), istdMaxFixedWhenSaved(0), nVerBuiltInNamesWhenSaved(0),
- ftcStandardChpStsh(0), ftcStandardChpCJKStsh(0), ftcStandardChpCTLStsh(0)
+ ftcAsci(0), ftcFE(0), ftcOther(0), ftcBi(0)
{
nStyleStart = rFib.fcStshf;
nStyleLen = rFib.lcbStshf;
@@ -6049,17 +6049,22 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
rSt >> nVerBuiltInNamesWhenSaved;
if( 14 > nRead ) break;
- rSt >> ftcStandardChpStsh;
+ rSt >> ftcAsci;
if( 16 > nRead ) break;
- rSt >> ftcStandardChpCJKStsh;
+ rSt >> ftcFE;
if ( 18 > nRead ) break;
- rSt >> ftcStandardChpCTLStsh;
+ rSt >> ftcOther;
+
+ ftcBi = ftcOther;
+
+ if ( 20 > nRead ) break;
+ rSt >> ftcBi;
// ggfs. den Rest ueberlesen
- if( 18 < nRead )
- rSt.SeekRel( nRead-18 );
+ if( 20 < nRead )
+ rSt.SeekRel( nRead-20 );
}
while( !this ); // Trick: obiger Block wird genau einmal durchlaufen
// und kann vorzeitig per "break" verlassen werden.
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index cd4bb2d..7e29e0a 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1464,11 +1464,13 @@ protected:
UINT16 istdMaxFixedWhenSaved; // How many fixed-index istds are there?
UINT16 nVerBuiltInNamesWhenSaved; // Current version of built-in stylenames
// ftc used by StandardChpStsh for this document
- UINT16 ftcStandardChpStsh;
+ UINT16 ftcAsci;
// CJK ftc used by StandardChpStsh for this document
- UINT16 ftcStandardChpCJKStsh;
+ UINT16 ftcFE;
+ // CTL/Other ftc used by StandardChpStsh for this document
+ UINT16 ftcOther;
// CTL ftc used by StandardChpStsh for this document
- UINT16 ftcStandardChpCTLStsh;
+ UINT16 ftcBi;
//No copying
WW8Style(const WW8Style&);
commit b36353099d6c2518fcbe0c86e1254249b7114650
Author: Petr Mladek <pmladek at suse.cz>
Date: Wed Feb 2 17:06:01 2011 +0100
RTF export crasher (bnc#656503)
Signed off by Cedric
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 026adba..faf6002 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -602,9 +602,10 @@ const SfxPoolItem* SwWW8AttrIter::HasTextItem( USHORT nWhich ) const
{
const SfxPoolItem* pRet = 0;
const SwpHints* pTxtAttrs = rNd.GetpSwpHints();
- xub_StrLen nTmpSwPos = m_rExport.m_aCurrentCharPropStarts.top();
- if (pTxtAttrs)
+
+ if (pTxtAttrs && m_rExport.m_aCurrentCharPropStarts.size())
{
+ xub_StrLen nTmpSwPos = m_rExport.m_aCurrentCharPropStarts.top();
for (USHORT i = 0; i < pTxtAttrs->Count(); ++i)
{
const SwTxtAttr* pHt = (*pTxtAttrs)[i];
commit b61d4e3e3d519672f908f87ad1987b02cf14c40e
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Thu Nov 18 12:37:58 2010 +0100
Fixed an infinite loop while exporting some files in doc/docx/rtf
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index a807481..4af4bb1 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1405,7 +1405,7 @@ public:
bool IsTxtAttr(xub_StrLen nSwPos);
- void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); }
+ void NextPos() { if ( nAktSwPos < STRING_NOTFOUND ) nAktSwPos = SearchNext( nAktSwPos + 1 ); }
void OutAttr( xub_StrLen nSwPos );
virtual const SfxPoolItem* HasTextItem( USHORT nWhich ) const;
@@ -1466,7 +1466,7 @@ public:
bool IsDropCap( int nSwPos );
bool RequiresImplicitBookmark();
- void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); }
+ void NextPos() { if ( nAktSwPos < STRING_NOTFOUND ) nAktSwPos = SearchNext( nAktSwPos + 1 ); }
void OutAttr( xub_StrLen nSwPos, bool bRuby = false );
virtual const SfxPoolItem* HasTextItem( USHORT nWhich ) const;
commit 60fc5e3665587389888e83c8970f1f216a72efbc
Author: Andras Timar <timar at fsf.hu>
Date: Tue Jan 25 21:14:53 2011 +0100
translations need more space on word count dialog
diff --git a/sw/source/ui/dialog/wordcountdialog.src b/sw/source/ui/dialog/wordcountdialog.src
index 359d95e..f73cac2 100644
--- a/sw/source/ui/dialog/wordcountdialog.src
+++ b/sw/source/ui/dialog/wordcountdialog.src
@@ -69,7 +69,7 @@ ModalDialog DLG_WORDCOUNT
FixedText FT_CURRENTCHARACTEREXCLUDINGSPACES
{
Pos = MAP_APPFONT ( 12 , 38 ) ;
- Size = MAP_APPFONT ( 80 , 8 ) ;
+ Size = MAP_APPFONT ( 98 , 8 ) ;
Text [ en-US ] = "Characters excluding spaces:";
};
FixedText FI_CURRENTCHARACTEREXCLUDINGSPACES
@@ -111,7 +111,7 @@ ModalDialog DLG_WORDCOUNT
FixedText FT_DOCCHARACTEREXCLUDINGSPACES
{
Pos = MAP_APPFONT ( 12 , 87 ) ;
- Size = MAP_APPFONT ( 80 , 8 ) ;
+ Size = MAP_APPFONT ( 98 , 8 ) ;
Text [ en-US ] = "Characters excluding spaces:";
};
FixedText FI_DOCCHARACTEREXCLUDINGSPACES
commit 8b28483538dc426475d651687b5505cf94149d22
Author: Noel Power <noel.power at novell.com>
Date: Mon Jan 10 15:23:27 2011 +0000
bnc#660816 improve formfield checkbox binary export ( and import )
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 46576e0..0641e96 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -336,6 +336,14 @@ namespace sw { namespace mark
void CheckboxFieldmark::SetChecked(bool checked)
{
(*GetParameters())[::rtl::OUString::createFromAscii(ODF_FORMCHECKBOX_RESULT)] = makeAny(checked);
+ bool bOld( IsChecked() );
+ if ( bOld != checked )
+ {
+ // mark document as modified
+ SwDoc *const pDoc( GetMarkPos().GetDoc() );
+ if ( pDoc )
+ pDoc->SetModified();
+ }
}
bool CheckboxFieldmark::IsChecked() const
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index ffb8427..f8b34bb 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3554,13 +3554,19 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
pChpPlc->AppendFkpEntry( Strm().Tell(), sizeof( aArr1 ), aArr1 );
- sal_uInt8 aFldHeader[] =
+ struct FFDataHeader
{
- 0xFF, 0xFF, 0xFF, 0xFF, // Unicode Marker...
- 0, 0, 0, 0,// 0, 0, 0, 0
+ sal_uInt32 version;
+ sal_uInt16 bits;
+ sal_uInt16 cch;
+ sal_uInt16 hps;
+ FFDataHeader() : version( 0xFFFFFFFF ), bits(0), cch(0), hps(0) {}
};
- aFldHeader[4] |= (type & 0x03);
+
+ FFDataHeader aFldHeader;
+ aFldHeader.bits |= (type & 0x03);
+
sal_Int32 ffres = 0; // rFieldmark.GetFFRes();
if ( pAsCheckbox && pAsCheckbox->IsChecked() )
ffres = 1;
@@ -3572,12 +3578,12 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
else
ffres = 0;
}
- aFldHeader[4] |= ( (ffres<<2) & 0x7C );
+ aFldHeader.bits |= ( (ffres<<2) & 0x7C );
std::vector< ::rtl::OUString > aListItems;
if (type==2)
{
- aFldHeader[5] |= 0x80; // ffhaslistbox
+ aFldHeader.bits |= 0x8000; // ffhaslistbox
const ::sw::mark::IFieldmark::parameter_map_t* const pParameters = rFieldmark.GetParameters();
::sw::mark::IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find(::rtl::OUString::createFromAscii(ODF_FORMDROPDOWN_LISTENTRY));
if(pListEntries != pParameters->end())
@@ -3607,7 +3613,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
};
sal_uInt32 slen = sizeof(sal_uInt32)
+ sizeof(aFldData)
- + sizeof( aFldHeader )
+ + sizeof( aFldHeader.version ) + sizeof( aFldHeader.bits ) + sizeof( aFldHeader.cch ) + sizeof( aFldHeader.hps )
+ 2*ffname.getLength() + 4
+ 2*ffdeftext.getLength() + 4
+ 2*ffformat.getLength() + 4
@@ -3615,8 +3621,10 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
+ 2*ffstattext.getLength() + 4
+ 2*ffentrymcr.getLength() + 4
+ 2*ffexitmcr.getLength() + 4;
+ if ( type )
+ slen += 2; // wDef
if ( type==2 ) {
- slen += 2; // for 0xFF, 0xFF
+ slen += 2; // sttb ( fExtend )
slen += 4; // for num of list items
const int items = aListItems.size();
for( int i = 0; i < items; i++ ) {
@@ -3631,17 +3639,14 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
OSL_ENSURE( len == 0x44-sizeof(sal_uInt32), "SwWW8Writer::WriteFormData(..) - wrong aFldData length" );
pDataStrm->Write( aFldData, len );
- len = sizeof( aFldHeader );
- OSL_ENSURE( len == 8, "SwWW8Writer::WriteFormData(..) - wrong aFldHeader length" );
-
- pDataStrm->Write( aFldHeader, len );
+ *pDataStrm << aFldHeader.version << aFldHeader.bits << aFldHeader.cch << aFldHeader.hps;
SwWW8Writer::WriteString_xstz( *pDataStrm, ffname, true ); // Form field name
- if ( type == 0 )
- SwWW8Writer::WriteString_xstz( *pDataStrm, ffdeftext, true );
- else
- pDataStrm->WriteNumber( (sal_uInt16)0 );
+ SwWW8Writer::WriteString_xstz( *pDataStrm, ffdeftext, true );
+ if ( type )
+ *pDataStrm << sal_uInt16(0);
+
SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffformat ), true );
SwWW8Writer::WriteString_xstz( *pDataStrm, String( ffhelptext ), true );
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 2cbe215..ce066fc 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2222,6 +2222,8 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
nChecked = true;
break;
case 25: //undefined, Undefined checkboxes are treated as unchecked
+ //but it appear that both visually and the value are picked up from the default in that case
+ break;
case 0: //unchecked
nChecked = false;
break;
commit 866e4b44f7d5ea75ba31ad78b6c8b58067627788
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri Jan 14 11:54:40 2011 -0500
Remove pesky on-line registration menu entry. (fdo#33112)
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 4e90101..cc8b013 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -448,7 +448,6 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 4e90101..cc8b013 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -448,7 +448,6 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 14e758e..32df447 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -449,7 +449,6 @@
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
- <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowCredits"/>
<menu:menuitem menu:id=".uno:About"/>
commit 0bc34a89434f97f5c25fae9d3529c292aba8e9e6
Author: Caolán McNamara <caolanm at 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)
diff --git a/sw/source/ui/misc/titlepage.src b/sw/source/ui/misc/titlepage.src
index deade3e..8e6aec6 100644
--- a/sw/source/ui/misc/titlepage.src
+++ b/sw/source/ui/misc/titlepage.src
@@ -212,15 +212,15 @@ ModalDialog DLG_TITLEPAGE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 182 ) ;
- Size = MAP_APPFONT ( 152 , 80 ) ;
+ Size = MAP_APPFONT ( 132 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
};
PushButton PB_PAGE_PROPERTIES
{
- Pos = MAP_APPFONT ( 170 , 182 ) ;
- Size = MAP_APPFONT ( 30 , 12 ) ;
+ Pos = MAP_APPFONT ( 150 , 182 ) ;
+ Size = MAP_APPFONT ( 50 , 12 ) ;
Text [ en-US ] = "Edit..." ;
};
FixedLine FL_BOTTOM
commit 6d54edb9fa96fd915a90b06886781827acd2fcde
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 11 20:33:41 2011 +0000
fix this to build
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 8037b62..a765a6b 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -841,6 +841,7 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
bool bAtStartA = pA != NULL && pA->GetMarkStart() == *GetPoint();
bool bAtStartB = pB != NULL && pB->GetMarkStart() == *GetMark();
bRet = ( pA != pB ) || bAtStartA || bAtStartB;
+ bool bProtectForm = pDoc->get( IDocumentSettingAccess::PROTECT_FORM );
if ( bProtectForm )
bRet |= ( pA == NULL || pB == NULL );
}
commit 8d9cf3fdfda0bf4b2ae2464edc0397b0e296f015
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Jan 11 20:18:26 2011 +0100
n#657135: Enhanced fields fixes (key inputs, and 0-length fields import)
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 9497f8f..46576e0 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -88,7 +88,7 @@ namespace
SwPaM aStartPaM(rStart);
SwPaM aEndPaM(rEnd);
io_pDoc->StartUndo(UNDO_UI_REPLACE, NULL);
- if( ( ch_start != aStartMark ) && ( rStart != rEnd ) )
+ if( ( ch_start != aStartMark ) && ( aEndMark != CH_TXT_ATR_FORMELEMENT ) )
{
io_pDoc->InsertString(aStartPaM, aStartMark);
rStart.nContent--;
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index ae1e9fe..8037b62 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -838,8 +838,9 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
else
{
// Form protection case
- bRet = ( pA != pB );
- bool bProtectForm = pDoc->get( IDocumentSettingAccess::PROTECT_FORM );
+ bool bAtStartA = pA != NULL && pA->GetMarkStart() == *GetPoint();
+ bool bAtStartB = pB != NULL && pB->GetMarkStart() == *GetMark();
+ bRet = ( pA != pB ) || bAtStartA || bAtStartB;
if ( bProtectForm )
bRet |= ( pA == NULL || pB == NULL );
}
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 01bd84f..026adba 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1821,7 +1821,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
if ( ch == CH_TXT_ATR_FIELDSTART )
{
- SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos + 1 ) );
+ SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos ) );
::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
@@ -1873,9 +1873,9 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
}
else if ( ch == CH_TXT_ATR_FIELDEND )
{
- SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos ) );
+ SwPosition aPosition( rNode, SwIndex( const_cast< SwTxtNode* >( &rNode ), nAktPos - 1 ) );
::sw::mark::IFieldmark const * const pFieldmark = pMarkAccess->getFieldmarkFor( aPosition );
- OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDSTART??" );
+ OSL_ENSURE( pFieldmark, "Looks like this doc is broken...; where is the Fieldmark for the FIELDEND??" );
ww::eField eFieldId = lcl_getFieldId( pFieldmark );
if ( pFieldmark->GetFieldname().equalsAscii( ODF_UNHANDLED ) )
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index 6bcfbca..cd4bb2d 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -683,7 +683,7 @@ public:
long Count() const { return ( pRef ) ? pRef->GetIMax() : 0; }
};
-/// Iterator for footnotes and endnotes
+/// Iterator for fields
class WW8PLCFx_FLD : public WW8PLCFx
{
private:
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 2213afb..b16bb6a 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -1755,9 +1755,17 @@ KEYINPUT_CHECKTABLE_INSDEL:
break;
case KEY_DELETE:
- if (rSh.IsInFrontOfLabel() &&
- rSh.NumOrNoNum(FALSE))
- eKeyState = KS_NumOrNoNum;
+ if ( !rSh.HasReadonlySel() )
+ {
+ if (rSh.IsInFrontOfLabel() &&
+ rSh.NumOrNoNum(FALSE))
+ eKeyState = KS_NumOrNoNum;
+ }
+ else
+ {
+ InfoBox( this, SW_RES( MSG_READONLY_CONTENT )).Execute();
+ eKeyState = KS_Ende;
+ }
break;
case KEY_DELETE | KEY_MOD2:
@@ -1921,6 +1929,11 @@ KEYINPUT_CHECKTABLE_INSDEL:
// <--
}
}
+ else
+ {
+ InfoBox( this, SW_RES( MSG_READONLY_CONTENT )).Execute();
+ eKeyState = KS_Ende;
+ }
break;
case KEY_RIGHT:
commit bc6fea9e91ce63236322a1725a725f7fb98aab47
Author: Petr Mladek <pmladek at 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 at 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.
commit 6824fd06ee8b6d4b1f783e82d61d453a5fd72ef7
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Jan 10 19:47:13 2011 +0100
Version 3.3.0.3, tag libreoffice-3.3.0.3 (3.3-rc3)
commit 6bd559789d5867b9a5adf56ec33660539c589a04
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Sun Jan 9 14:06:58 2011 +0000
We need to move to the next record during mail merge. (fdo#32790)
I believe this code change was unintentional. We shouldn't be
skipping MoveResultSet call or else all the emails would be sent to
the first person unintentionally. ;-)
(cherry picked from commit 20b3b54b246159baeac941fe0acdeb61cc5cd112)
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index a3bad20..f6d0409 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -1221,9 +1221,9 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
#if OSL_DEBUG_LEVEL > 1
sal_Int32 nTarget =
- rConfigItem.MoveResultSet(rInfo.nDBRow);
- OSL_ENSURE( nTarget == rInfo.nDBRow, "row of current document could not be selected");
#endif
+ rConfigItem.MoveResultSet(rInfo.nDBRow);
+ OSL_ENSURE( nTarget == rInfo.nDBRow, "row of current document could not be selected");
OSL_ENSURE( sEMailColumn.Len(), "No email column selected");
::rtl::OUString sEMail = lcl_GetColumnValueOf(sEMailColumn, xColAccess);
SwMailDescriptor aDesc;
commit b44161cba1b34f9513034561a206768c029bde5b
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Jan 7 21:01:01 2011 +0100
remove commented code
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index b502253..7221f6a 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1339,14 +1339,8 @@ void SwDoc::CalculatePagesForPrinting(
// get PageRange value to use
OUString aPageRange;
- // --> PL, OD #i116085# - adjusting fix for i113919
-// if (bIsPDFExport)
-// {
-// aPageRange = rOptions.getStringValue( "PageRange", OUString() );
-// }
-// else
+ // PL, OD #i116085# - adjusting fix for i113919
if ( !bIsPDFExport )
- // <--
{
// PageContent :
// 0 -> print all pages (default if aPageRange is empty)
commit 04a1bae024326f04cbcd0698eb81c0f4adb3a4ba
Merge: d45b32b... 918d432...
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Jan 7 20:55:01 2011 +0100
Merge commit 'ooo/OOO330_m19' into libreoffice-3-3
commit 918d4322d8cedadcebaa3b5f57dd465cd15856a8
Merge: 450deef... 4c8a903...
Author: Kurt Zenker <kz at openoffice.org>
Date: Thu Jan 6 14:53:34 2011 +0100
CWS-TOOLING: integrate CWS ooo33gsl13
commit d45b32b52f21c6078b2a945bf84864b046dd3a0b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 4 10:42:47 2011 +0000
Resolves: fdo#32633 stretch title dialog to get translations to fix
(cherry picked from commit c75a9e280e3f1282c25d7c1f572cfa4bad3f8ba8)
diff --git a/sw/source/ui/misc/titlepage.src b/sw/source/ui/misc/titlepage.src
index 4eed4f8..deade3e 100644
--- a/sw/source/ui/misc/titlepage.src
+++ b/sw/source/ui/misc/titlepage.src
@@ -54,7 +54,7 @@ ModalDialog DLG_TITLEPAGE
RadioButton RB_USE_EXISTING_PAGES
{
Pos = MAP_APPFONT ( 12 , 18 ) ;
- Size = MAP_APPFONT ( 150 , 10 ) ;
+ Size = MAP_APPFONT ( 198 , 10 ) ;
Text [ en-US ] = "Convert existing pages to title pages" ;
TabStop = TRUE ;
Check = TRUE ;
@@ -63,20 +63,20 @@ ModalDialog DLG_TITLEPAGE
RadioButton RB_INSERT_NEW_PAGES
{
Pos = MAP_APPFONT ( 12 , 34 ) ;
- Size = MAP_APPFONT ( 150 , 10 ) ;
+ Size = MAP_APPFONT ( 198 , 10 ) ;
Text [ en-US ] = "Insert new title pages" ;
Text [ x-comment ] = " ";
};
FixedText FT_PAGE_COUNT
{
Pos = MAP_APPFONT ( 12 , 50 ) ;
- Size = MAP_APPFONT ( 80 , 8 ) ;
+ Size = MAP_APPFONT ( 82 , 8 ) ;
Text [ en-US ] = "Number of title pages" ;
Text [ x-comment ] = " ";
};
NumericField NF_PAGE_COUNT
{
- Pos = MAP_APPFONT ( 80 , 50 ) ;
+ Pos = MAP_APPFONT ( 100 , 50 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -91,7 +91,7 @@ ModalDialog DLG_TITLEPAGE
};
FixedText FT_PAGE_PAGES
{
- Pos = MAP_APPFONT ( 116 , 50 ) ;
+ Pos = MAP_APPFONT ( 136 , 50 ) ;
Size = MAP_APPFONT ( 80 , 10 ) ;
Text [ en-US ] = "pages" ;
Text [ x-comment ] = " ";
@@ -99,14 +99,14 @@ ModalDialog DLG_TITLEPAGE
FixedText FT_PAGE_START
{
Pos = MAP_APPFONT ( 12 , 66 ) ;
- Size = MAP_APPFONT ( 58 , 8 ) ;
+ Size = MAP_APPFONT ( 82 , 8 ) ;
Text [ en-US ] = "Place title pages at" ;
Text [ x-comment ] = " ";
};
RadioButton RB_DOCUMENT_START
{
- Pos = MAP_APPFONT ( 80 , 66 ) ;
- Size = MAP_APPFONT ( 80 , 10 ) ;
+ Pos = MAP_APPFONT ( 100 , 66 ) ;
+ Size = MAP_APPFONT ( 110 , 10 ) ;
Text [ en-US ] = "Document Start" ;
TabStop = TRUE ;
Check = TRUE ;
@@ -114,14 +114,14 @@ ModalDialog DLG_TITLEPAGE
};
RadioButton RB_PAGE_START
{
- Pos = MAP_APPFONT ( 80 , 78 ) ;
+ Pos = MAP_APPFONT ( 100 , 78 ) ;
Size = MAP_APPFONT ( 30 , 10 ) ;
Text [ en-US ] = "Page" ;
Text [ x-comment ] = " ";
};
NumericField NF_PAGE_START
{
- Pos = MAP_APPFONT ( 111 , 78 ) ;
+ Pos = MAP_APPFONT ( 131 , 78 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -144,7 +144,7 @@ ModalDialog DLG_TITLEPAGE
CheckBox CB_RESTART_NUMBERING
{
Pos = MAP_APPFONT ( 12, 111 ) ;
- Size = MAP_APPFONT ( 150 , 10 ) ;
+ Size = MAP_APPFONT ( 198 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Reset Page Numbering after title pages" ;
Text [ x-comment ] = " ";
@@ -152,13 +152,13 @@ ModalDialog DLG_TITLEPAGE
FixedText FT_RESTART_NUMBERING
{
Pos = MAP_APPFONT ( 20 , 125 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
+ Size = MAP_APPFONT ( 74 , 10 ) ;
Text [ en-US ] = "Page Number" ;
Text [ x-comment ] = " ";
};
NumericField NF_RESTART_NUMBERING
{
- Pos = MAP_APPFONT ( 60 , 125 ) ;
+ Pos = MAP_APPFONT ( 100 , 125 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -174,7 +174,7 @@ ModalDialog DLG_TITLEPAGE
CheckBox CB_SET_PAGE_NUMBER
{
Pos = MAP_APPFONT ( 12 , 139 ) ;
- Size = MAP_APPFONT ( 150 , 10 ) ;
+ Size = MAP_APPFONT ( 198 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Set Page Number for first title page" ;
Text [ x-comment ] = " ";
@@ -182,13 +182,13 @@ ModalDialog DLG_TITLEPAGE
FixedText FT_SET_PAGE_NUMBER
{
Pos = MAP_APPFONT ( 20 , 153 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
+ Size = MAP_APPFONT ( 74 , 10 ) ;
Text [ en-US ] = "Page Number" ;
Text [ x-comment ] = " ";
};
NumericField NF_SET_PAGE_NUMBER
{
- Pos = MAP_APPFONT ( 60 , 153 ) ;
+ Pos = MAP_APPFONT ( 100 , 153 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -212,7 +212,7 @@ ModalDialog DLG_TITLEPAGE
{
Border = TRUE ;
Pos = MAP_APPFONT ( 12 , 182 ) ;
- Size = MAP_APPFONT ( 150 , 80 ) ;
+ Size = MAP_APPFONT ( 152 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
commit 3748bdef44c7e1649a5db723fad762d314b84646
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 29 20:53:22 2010 +0000
Resolves: fdo#32633 rearrange title dialog to get translations to fix
(cherry picked from commit 049b8e51b06f64fa8b353d65589b55d60ce5b83e)
diff --git a/sw/source/ui/misc/titlepage.src b/sw/source/ui/misc/titlepage.src
index 57b9075..4eed4f8 100644
--- a/sw/source/ui/misc/titlepage.src
+++ b/sw/source/ui/misc/titlepage.src
@@ -40,7 +40,7 @@ ModalDialog DLG_TITLEPAGE
HelpID = HID_TITLEPAGE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 216 , 201 ) ;
+ Size = MAP_APPFONT ( 216 , 229 ) ;
Text [ en-US ] = "Title Pages" ;
Moveable = TRUE ;
@@ -105,7 +105,7 @@ ModalDialog DLG_TITLEPAGE
};
RadioButton RB_DOCUMENT_START
{
- Pos = MAP_APPFONT ( 70 , 66 ) ;
+ Pos = MAP_APPFONT ( 80 , 66 ) ;
Size = MAP_APPFONT ( 80 , 10 ) ;
Text [ en-US ] = "Document Start" ;
TabStop = TRUE ;
@@ -114,14 +114,14 @@ ModalDialog DLG_TITLEPAGE
};
RadioButton RB_PAGE_START
{
- Pos = MAP_APPFONT ( 70 , 78 ) ;
+ Pos = MAP_APPFONT ( 80 , 78 ) ;
Size = MAP_APPFONT ( 30 , 10 ) ;
Text [ en-US ] = "Page" ;
Text [ x-comment ] = " ";
};
NumericField NF_PAGE_START
{
- Pos = MAP_APPFONT ( 95 , 78 ) ;
+ Pos = MAP_APPFONT ( 111 , 78 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -151,14 +151,14 @@ ModalDialog DLG_TITLEPAGE
};
FixedText FT_RESTART_NUMBERING
{
- Pos = MAP_APPFONT ( 140 , 111 ) ;
+ Pos = MAP_APPFONT ( 20 , 125 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Page Number" ;
Text [ x-comment ] = " ";
};
NumericField NF_RESTART_NUMBERING
{
- Pos = MAP_APPFONT ( 180 , 111 ) ;
+ Pos = MAP_APPFONT ( 60 , 125 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -173,7 +173,7 @@ ModalDialog DLG_TITLEPAGE
};
CheckBox CB_SET_PAGE_NUMBER
{
- Pos = MAP_APPFONT ( 12 , 125 ) ;
+ Pos = MAP_APPFONT ( 12 , 139 ) ;
Size = MAP_APPFONT ( 150 , 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Set Page Number for first title page" ;
@@ -181,14 +181,14 @@ ModalDialog DLG_TITLEPAGE
};
FixedText FT_SET_PAGE_NUMBER
{
- Pos = MAP_APPFONT ( 140 , 125 ) ;
+ Pos = MAP_APPFONT ( 20 , 153 ) ;
Size = MAP_APPFONT ( 50 , 10 ) ;
Text [ en-US ] = "Page Number" ;
Text [ x-comment ] = " ";
};
NumericField NF_SET_PAGE_NUMBER
{
- Pos = MAP_APPFONT ( 180 , 125 ) ;
+ Pos = MAP_APPFONT ( 60 , 153 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
@@ -203,7 +203,7 @@ ModalDialog DLG_TITLEPAGE
};
FixedLine FL_PAGE_PROPERTIES
{
- Pos = MAP_APPFONT ( 6 , 141 ) ;
+ Pos = MAP_APPFONT ( 6 , 169 ) ;
Size = MAP_APPFONT ( 204 , 8 ) ;
Text [ en-US ] = "Edit Page Properties" ;
Text [ x-comment ] = " ";
@@ -211,7 +211,7 @@ ModalDialog DLG_TITLEPAGE
ListBox LB_PAGE_PROPERTIES
{
Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 154 ) ;
+ Pos = MAP_APPFONT ( 12 , 182 ) ;
Size = MAP_APPFONT ( 150 , 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
@@ -219,30 +219,30 @@ ModalDialog DLG_TITLEPAGE
};
PushButton PB_PAGE_PROPERTIES
{
- Pos = MAP_APPFONT ( 170 , 154 ) ;
+ Pos = MAP_APPFONT ( 170 , 182 ) ;
Size = MAP_APPFONT ( 30 , 12 ) ;
Text [ en-US ] = "Edit..." ;
};
FixedLine FL_BOTTOM
{
- Pos = MAP_APPFONT ( 6 , 170 ) ;
+ Pos = MAP_APPFONT ( 6 , 198 ) ;
Size = MAP_APPFONT ( 204 , 8 ) ;
};
OKButton PB_OK
{
- Pos = MAP_APPFONT ( 54 , 181 ) ;
+ Pos = MAP_APPFONT ( 54 , 209 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
DefButton = TRUE ;
};
CancelButton PB_CANCEL
{
- Pos = MAP_APPFONT ( 107 , 181 ) ;
+ Pos = MAP_APPFONT ( 107 , 209 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
DefButton = TRUE ;
};
HelpButton PB_HELP
{
- Pos = MAP_APPFONT ( 160 , 181 ) ;
+ Pos = MAP_APPFONT ( 160 , 209 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
};
commit 4c8a903f074a3230f78ea0a829a0bdb9ecf18b47
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Wed Dec 15 13:24:33 2010 +0100
ooo33gsl13: #i116085# adjust PageRange handling in writer PDF export
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 4cd3601..80c5a95 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1336,12 +1336,14 @@ void SwDoc::CalculatePagesForPrinting(
// get PageRange value to use
OUString aPageRange;
- if (bIsPDFExport)
- {
- // ?? rOptions.getValue( C2U("Selection") );
- aPageRange = rOptions.getStringValue( "PageRange", OUString() );
- }
- else
+ // --> PL, OD #i116085# - adjusting fix for i113919
+// if (bIsPDFExport)
+// {
+// aPageRange = rOptions.getStringValue( "PageRange", OUString() );
+// }
+// else
+ if ( !bIsPDFExport )
+ // <--
{
// PageContent :
// 0 -> print all pages (default if aPageRange is empty)
commit 450deef7af2e6150493f9f584bf08600884ca098
Merge: e2bbfbc... 7580b9e...
Author: obo <obo at openoffice.org>
Date: Thu Dec 9 10:58:42 2010 +0100
CWS-TOOLING: integrate CWS calc33stopper3
commit 7580b9ec86dbfdf78f70c49159b3e5a17de02e66
Author: os <os at openoffice.org>
Date: Wed Dec 8 10:17:56 2010 +0100
#i115956# token translation fixed
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index af5c02c..b9a75ad 100755
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -2317,18 +2317,23 @@ void SmParser::Special()
// conversion of symbol names for 6.0 (XML) file format
// (name change on import / export.
// UI uses localized names XML file format does not.)
- if (IsImportSymbolNames())
+ if( rName.Len() && rName.GetChar( 0 ) == sal_Unicode( '%' ) )
{
- const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
- aNewName = rLSD.GetUiSymbolName( rName );
- bReplace = TRUE;
- }
- else if (IsExportSymbolNames())
- {
- const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
- aNewName = rLSD.GetExportSymbolName( rName );
- bReplace = TRUE;
+ if (IsImportSymbolNames())
+ {
+ const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
+ aNewName = rLSD.GetUiSymbolName( rName.Copy( 1 ) );
+ bReplace = TRUE;
+ }
+ else if (IsExportSymbolNames())
+ {
+ const SmLocalizedSymbolData &rLSD = SM_MOD()->GetLocSymbolData();
+ aNewName = rLSD.GetExportSymbolName( rName.Copy( 1 ) );
+ bReplace = TRUE;
+ }
}
+ if( aNewName.Len() )
+ aNewName.Insert( '%', 0 );
}
else // 5.0 <-> 6.0 formula text (symbol name) conversion
{
@@ -2367,7 +2372,7 @@ void SmParser::Special()
if (bReplace && aNewName.Len() && rName != aNewName)
{
- Replace( GetTokenIndex() + 1, rName.Len(), aNewName );
+ Replace( GetTokenIndex(), rName.Len(), aNewName );
rName = aNewName;
}
More information about the Libreoffice-commits
mailing list