[ooo-build-commit] Branch 'ooo/master' - 3 commits - sw/inc sw/source sw/uiconfig
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Jul 3 19:48:26 PDT 2009
sw/inc/doc.hxx | 1
sw/source/core/crsr/pam.cxx | 23 +++++++++++++-----
sw/source/core/doc/docnew.cxx | 38 +++++++++++++++++--------------
sw/source/core/doc/docnum.cxx | 4 +++
sw/source/core/fields/cellfml.cxx | 2 +
sw/source/core/txtnode/fntcache.cxx | 18 +++++++-------
sw/source/core/unocore/unoportenum.cxx | 11 +++++++-
sw/source/filter/ww8/ww8atr.cxx | 4 ---
sw/source/ui/app/appopt.cxx | 3 ++
sw/source/ui/dbui/mmlayoutpage.cxx | 3 +-
sw/source/ui/dbui/mmoutputpage.cxx | 2 +
sw/source/ui/dochdl/swdtflvr.cxx | 10 +++++---
sw/source/ui/envelp/mailmrge.cxx | 27 ++++------------------
sw/source/ui/inc/convert.hxx | 4 +--
sw/source/ui/ribbar/conrect.cxx | 8 ++++--
sw/source/ui/table/convert.cxx | 4 +--
sw/source/ui/table/convert.src | 6 ++--
sw/uiconfig/swform/menubar/menubar.xml | 2 -
sw/uiconfig/swreport/menubar/menubar.xml | 2 -
19 files changed, 95 insertions(+), 77 deletions(-)
New commits:
commit b3ee53ebcf4ab87a7c4939f6a57851651ca0be92
Author: Release Engineers <releng at openoffice.org>
Date: Fri Jul 3 14:21:50 2009 +0000
CWS-TOOLING: integrate CWS dba32c
2009-06-29 20:53:25 +0200 fs r273484 : #i103138# Rectangle conversion
2009-06-29 20:51:50 +0200 fs r273483 : #i103138# yet more refactoring, now also setting the proper zoom level at the proper point in time
2009-06-29 13:40:26 +0200 fs r273470 : added svn:ignore to ignore output paths
2009-06-29 10:08:54 +0200 fs r273455 : #i103138#
refactored the code for positioning/zooming the control
Basically, we now allow adjustControlGeometry_throw (formerly known as positionControl_throw and setControlZoom) to
take an additional ViewTransformation parameter, describing the transformation to obtain the actual
control position/size. Consequently, positionControl itself also allows for a ViewTransformation parameter.
This has become necessary since during painting, the device which we created our control for might not necessarily
have a proper MapMode set. In this case, if we would use this map mode for calculating the control's position/size,
this would lead to wrong results.
Note that this problem was introduced by the fix for #i101398#: During the fix, we postponed the control creation
to a later time (when it is really needed). At this later time, the MapMode at the device is broken, at the earlier
time where we formerly crearted the control (createPrimitive2DSequence), it is not yet broken.
Whether or not the MapMode is defined as "broken" might depend on one's point of view, however ...
I consider it broken, since:
- we need the map mode to obtain the proper zoom level, which is to be forwarded to the control
- there are scenarios where the MapMode is *not* set to MAP_PIXEL (in those scenarios, everything works
fine), and there are scenarios where it *is* set to MAP_PIXEL (in those the bug 103138 appears).
It somehow feels wrong that one cannot rely on the device's map mode this way, but on the other hand
one has no possibility to obtain the current zoom by other means.
Note that one issue (still to be submitted) is left: In the page pane of a Draw/Impress document, controls
have a wrong text size. This is because in this pane, the above-mentioned "broken" map mode is used,
which means the controls have a zoom of "1:1" set, which is wrong here.
2009-06-25 13:41:35 +0200 msc r273380 : #100000# the tabs changed die to new properties
2009-06-24 12:42:40 +0200 msc r273330 : #102082# remove issue warning
2009-06-22 10:43:14 +0200 fs r273201 : createPrimitive2DSequence: care for being disposed
2009-06-18 12:35:13 +0200 oj r273109 : #i102305# make nooptfiles for gcc
2009-06-17 12:14:37 +0200 oj r273056 : #i102305# fix for linux
2009-06-17 07:20:22 +0200 oj r273046 : #i102305# move ValueTransfer into the for loop to avoid a crash under Linux
2009-06-17 07:17:28 +0200 oj r273045 : #i102305# use varchar
2009-06-15 14:11:27 +0200 fs r272983 : added since tag
2009-06-15 12:11:39 +0200 oj r272973 : #i102305# SAL_DLLPUBLIC_EXPORT inserted
2009-06-15 11:08:53 +0200 fs r272969 : #i10000#
2009-06-15 09:25:13 +0200 fs r272963 : merging fix for P1 issue #i102701#
2009-06-11 11:31:24 +0200 fs r272858 : #i10000# copied the fix which before the rebase was done in ../dialog/macropg.src
2009-06-11 09:38:14 +0200 fs r272846 : CWS-TOOLING: rebase CWS dba32c to trunk at 272827 (milestone: DEV300:m50)
2009-06-02 09:53:10 +0200 fs r272483 : #i10000#
2009-05-29 15:55:03 +0200 fs r272465 : #i100818#
2009-05-29 12:58:43 +0200 fs r272452 : don't apply comphelper::getString on possibly VOID any
2009-05-29 10:38:35 +0200 oj r272437 : #i101519# handle where condition
2009-05-29 09:53:39 +0200 fs r272434 : #i100818# call into releaseStubs /without/ locked GlobalMutex
2009-05-28 07:53:44 +0200 oj r272375 : #i101369# parse tree changed
2009-05-27 14:53:36 +0200 fs r272347 : #i10000#
2009-05-27 09:29:15 +0200 oj r272327 : #i101626# check for double before hard cast
2009-05-27 09:13:58 +0200 oj r272326 : #i101626# handle void correctly
2009-05-27 08:04:39 +0200 oj r272321 : #i102256# wrong method signature used
2009-05-27 07:55:52 +0200 oj r272320 : #i101519# look up parameter typ if used in function
2009-05-27 06:49:07 +0200 oj r272319 : #i101519# set parameter from rowset as well
2009-05-26 13:30:56 +0200 oj r272297 : #i101987# impl XBatchExecution
2009-05-26 12:44:34 +0200 oj r272293 : #i101700# check if group is not set
2009-05-26 12:16:53 +0200 oj r272290 : #i101369# resolved some reduce7reduce problems with boolean_term and search_condition
2009-05-26 12:12:42 +0200 oj r272289 : #i101369# fix for or on one line criteria
2009-05-25 16:02:25 +0200 fs r272257 : #i999704# +PROPERTY_MOUSE_WHEEL_BEHAVIOR
2009-05-25 16:01:55 +0200 fs r272256 : merging the changes from CWS dba32b herein
2009-05-25 15:49:57 +0200 fs r272254 : #i999704#
2009-05-25 15:32:57 +0200 fs r272252 : #i99704# grid columns also to respect the MouseWheelBehavior property
2009-05-25 15:23:43 +0200 fs r272251 : don't pass empty Anys to ::comphelper::getString
2009-05-25 14:48:43 +0200 fs r272248 : merged changes from CWS dba32b herein
2009-05-25 14:44:40 +0200 fs r272247 : #i99704# support new MouseWheelBehavior property
2009-05-25 14:43:18 +0200 fs r272246 : #i99704# WheelWithoutFocus (peer property) superseded by MouseWheelBehavior (model property)
2009-05-25 14:41:03 +0200 fs r272245 : #i99704# no need to set the mouse wheel behavior at the peer, this is now a model property, having the right default
2009-05-25 14:39:31 +0200 fs r272243 : removed dead import
2009-05-25 14:35:36 +0200 fs r272242 : the new EnableVisible doesn't make sense for grid columns
2009-05-25 14:34:33 +0200 fs r272241 : #i99704# +MouseWheelBehavior - allow to enable/disable the mouse wheel for the control, or make it focus-dependent
2009-05-25 14:26:11 +0200 fs r272240 : #i99704# change MouseSettings wheel flag (NoWheelActionWithoutFocus) to a three-state option, allowing to completely ignore the mouse wheel
2009-05-23 21:35:59 +0200 fs r272213 : localize 'sub component opened/closed' event
2009-05-22 21:42:47 +0200 fs r272211 : #i102003#
2009-05-22 21:42:20 +0200 fs r272210 : grammar
2009-05-22 21:36:10 +0200 fs r272209 : #i102140# load only once, not twice, and show error messages during loading (and during any form action, that is) asynchronously
2009-05-22 21:35:11 +0200 fs r272208 : #i102140# +clear
2009-05-22 14:50:30 +0200 fs r272194 : #i102139# for newly created DB docs, set the MacroExecutionMode to USE_CONFIG
2009-05-22 12:03:42 +0200 fs r272180 : #i88878#
provided by noel.power at novell.com
implement a visibility property (EnableVisible) for toolkit controls, and usage in forms and UNO dialogs
2009-05-15 15:37:31 +0200 fs r271942 : #i100671# corrected some @since tags, so autodoc has better chances of correctly reading them
2009-05-15 15:33:11 +0200 fs r271940 : don't call comphelper::getFOO for VOID values
2009-05-15 15:08:31 +0200 fs r271937 : includes
2009-05-15 13:39:22 +0200 fs r271934 : #i101398# createPrimitive2DSequence: when we already have a control, use the old code. In particular, call positionControlForPaint
2009-05-15 12:33:48 +0200 fs r271933 : make the geometry a part of the ControlPrimitive2D's identity
2009-05-15 10:15:44 +0200 fs r271928 : #i10000#
2009-05-14 20:55:38 +0200 fs r271921 : #i101398# don't reuse the name PRIMITIVE_ID_CONTROLPRIMITIVE2D, make the name of our own ControlPrimitive2D unique
2009-05-14 20:55:31 +0200 fs r271920 : #i101398# don't reuse the name PRIMITIVE_ID_CONTROLPRIMITIVE2D, make the name of our own ControlPrimitive2D unique
2009-05-14 20:23:23 +0200 fs r271919 : #i101622#
2009-05-14 16:04:38 +0200 fs r271898 : don't use comphelper::getInt32 on voids
2009-05-14 16:04:12 +0200 fs r271897 : merge fix for issue whose number just slipped my memory ... (originally fixed in CWS dba32b)
2009-05-14 15:36:55 +0200 fs r271895 : merging changes from DEV300:m48
2009-05-07 14:43:19 +0200 fs r271670 : #i101477#
2009-05-07 14:37:30 +0200 fs r271668 : #i101477#
2009-05-07 09:27:30 +0200 oj r271628 : #i101343# remove pch
2009-05-06 09:36:02 +0200 fs r271568 : getFoo: diagnostics
2009-05-04 09:23:06 +0200 oj r271438 : CWS-TOOLING: rebase CWS dba32c to trunk at 271427 (milestone: DEV300:m47)
2009-04-29 23:18:13 +0200 fs r271394 : #i101398# use a dedicated 2DPrimitive for UNO Controls, which is able to provide the B2DRange *without* actually creating the control
2009-04-29 13:52:25 +0200 fs r271366 : #i101308#
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index df97329..13448e4 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -37,7 +37,6 @@
</menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menuitem menu:id=".uno:Signature"/>
<menu:menu menu:id=".uno:TemplateMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:Organizer"/>
@@ -421,7 +420,6 @@
<menu:menuitem menu:id=".uno:MacroRecorder"/>
<menu:menuitem menu:id=".uno:RunMacro"/>
<menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuitem menu:id=".uno:MacroSignature"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 5ef70e2..1f94b7c 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -37,7 +37,6 @@
</menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menuitem menu:id=".uno:Signature"/>
<menu:menu menu:id=".uno:TemplateMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:Organizer"/>
@@ -421,7 +420,6 @@
<menu:menuitem menu:id=".uno:MacroRecorder"/>
<menu:menuitem menu:id=".uno:RunMacro"/>
<menu:menu menu:id=".uno:ScriptOrganizer"/>
- <menu:menuitem menu:id=".uno:MacroSignature"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:MacroOrganizer?TabId:short=1"/>
</menu:menupopup>
commit 5d7e2776ce4920b66d82348292ef2bb39f0419c0
Author: Release Engineers <releng at openoffice.org>
Date: Fri Jul 3 14:04:55 2009 +0000
CWS-TOOLING: integrate CWS os130a
2009-06-05 15:47:33 +0200 os r272704 : #63267#
2009-06-05 15:44:03 +0200 os r272703 : #i99578#
2009-06-05 15:43:27 +0200 os r272702 : #i99529#
2009-06-05 15:41:39 +0200 os r272701 : #i99526#
2009-06-05 15:39:32 +0200 os r272700 : #i91534#
2009-06-05 15:37:12 +0200 os r272699 : #i102000#
2009-06-05 15:34:12 +0200 os r272698 : #i101952#
2009-06-05 15:32:31 +0200 os r272697 : #i101814#
2009-06-05 15:28:55 +0200 os r272695 : #i101214#
2009-06-05 15:25:05 +0200 os r272694 : #i101007#
2009-06-05 15:22:49 +0200 os r272692 : #i100487#
2009-06-05 15:17:13 +0200 os r272691 : #100825#
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e21b8f2..29676ec 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -700,6 +700,7 @@ private:
SwFmt *_MakeFrmFmt(const String &, SwFmt *, BOOL, BOOL );
SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, BOOL, BOOL );
+ void InitTOXTypes();
public:
/** Life cycle
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index b894156..7a8a83e 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -851,13 +851,22 @@ SwCntntNode* GetNode( SwPaM & rPam, BOOL& rbFirst, SwMoveFn fnMove,
{
rbFirst = FALSE;
pNd = rPam.GetCntntNode();
- if( pNd &&
- ( 0 == ( pFrm = pNd->GetFrm()) ||
- ( !bInReadOnly && pFrm->IsProtected() ) ||
- (pFrm->IsTxtFrm() && ((SwTxtFrm*)pFrm)->IsHiddenNow()) ) ||
- ( !bInReadOnly && pNd->FindSectionNode() &&
- pNd->FindSectionNode()->GetSection().IsProtect() ))
- pNd = 0;
+ if( pNd )
+ {
+ if(
+ (
+ 0 == ( pFrm = pNd->GetFrm()) ||
+ ( !bInReadOnly && pFrm->IsProtected() ) ||
+ (pFrm->IsTxtFrm() && ((SwTxtFrm*)pFrm)->IsHiddenNow())
+ ) ||
+ ( !bInReadOnly && pNd->FindSectionNode() &&
+ pNd->FindSectionNode()->GetSection().IsProtect()
+ )
+ )
+ {
+ pNd = 0;
+ }
+ }
}
if( !pNd ) // steht Cursor auf keinem ContentNode ?
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index d145574..30ed6e8 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -430,22 +430,7 @@ SwDoc::SwDoc() :
pNewDBMgr = new SwNewDBMgr;
// create TOXTypes
- ShellResource* pShellRes = ViewShell::GetShellRes();
-
- SwTOXType * pNew = new SwTOXType(TOX_CONTENT, pShellRes->aTOXContentName );
- pTOXTypes->Insert( pNew, pTOXTypes->Count() );
- pNew = new SwTOXType(TOX_INDEX, pShellRes->aTOXIndexName );
- pTOXTypes->Insert( pNew, pTOXTypes->Count() );
- pNew = new SwTOXType(TOX_USER, pShellRes->aTOXUserName );
- pTOXTypes->Insert( pNew, pTOXTypes->Count() );
- pNew = new SwTOXType(TOX_ILLUSTRATIONS, pShellRes->aTOXIllustrationsName );
- pTOXTypes->Insert( pNew, pTOXTypes->Count() );
- pNew = new SwTOXType(TOX_OBJECTS, pShellRes->aTOXObjectsName );
- pTOXTypes->Insert( pNew, pTOXTypes->Count() );
- pNew = new SwTOXType(TOX_TABLES, pShellRes->aTOXTablesName );
- pTOXTypes->Insert( pNew, pTOXTypes->Count() );
- pNew = new SwTOXType(TOX_AUTHORITIES, pShellRes->aTOXAuthoritiesName );
- pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+ InitTOXTypes();
// --> OD 2008-03-07 #refactorlists#
// pass empty item set containing the paragraph's list attributes
@@ -816,7 +801,7 @@ void SwDoc::ClearDoc()
// in den BookMarks sind Indizies auf den Content. Diese muessen vorm
// loesche der Nodes geloescht werden.
pMarkManager->clearAllMarks();
- pTOXTypes->DeleteAndDestroy( 0, pTOXTypes->Count() );
+ InitTOXTypes();
// create a dummy pagedesc for the layout
sal_uInt16 nDummyPgDsc = MakePageDesc( String::CreateFromAscii( "?DUMMY?" ));
@@ -1053,3 +1038,22 @@ SwDoc::GetXmlIdRegistry()
return *m_pXmlIdRegistry;
}
+void SwDoc::InitTOXTypes()
+{
+ ShellResource* pShellRes = ViewShell::GetShellRes();
+ SwTOXType * pNew = new SwTOXType(TOX_CONTENT, pShellRes->aTOXContentName );
+ pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+ pNew = new SwTOXType(TOX_INDEX, pShellRes->aTOXIndexName );
+ pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+ pNew = new SwTOXType(TOX_USER, pShellRes->aTOXUserName );
+ pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+ pNew = new SwTOXType(TOX_ILLUSTRATIONS, pShellRes->aTOXIllustrationsName );
+ pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+ pNew = new SwTOXType(TOX_OBJECTS, pShellRes->aTOXObjectsName );
+ pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+ pNew = new SwTOXType(TOX_TABLES, pShellRes->aTOXTablesName );
+ pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+ pNew = new SwTOXType(TOX_AUTHORITIES, pShellRes->aTOXAuthoritiesName );
+ pTOXTypes->Insert( pNew, pTOXTypes->Count() );
+}
+
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 5041378..611dcb0 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2094,6 +2094,10 @@ BOOL SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, BOOL bIsOutlMv )
}
else
{
+ //Impossible to move to negative index
+ if( ULONG(abs( nOffset )) > nStIdx)
+ return FALSE;
+
nInEndIdx = nStIdx - 1;
nStIdx += nOffset;
}
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index c04498b..41e671c 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -371,6 +371,7 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
rNewStr += ')';
}
else if( pSttBox && !pLastBox ) // nur die StartBox ?
+ {
//JP 12.01.99: und keine EndBox in der Formel!
// Berechne den Wert der Box
if ( pSttBox->getRowSpan() >= 1 )
@@ -378,6 +379,7 @@ void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
rNewStr += pCalcPara->rCalc.GetStrResult(
pSttBox->GetValue( *pCalcPara ), FALSE );
}
+ }
else
pCalcPara->rCalc.SetCalcError( CALC_SYNTAX ); // Fehler setzen
rNewStr += ' ';
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 35a5f07..1e47e16 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -912,10 +912,10 @@ static void lcl_DrawLineForWrongListData(
if (rInf.GetOut().GetConnectMetaFile())
rInf.GetOut().Push();
- const Color aCol( rInf.GetOut().GetTextLineColor() );
+ const Color aCol( rInf.GetOut().GetLineColor() );
const BOOL bColSave = aCol != aLineColor;
if (bColSave)
- rInf.GetOut().SetTextLineColor( aLineColor );
+ rInf.GetOut().SetLineColor( aLineColor );
// iterate over all ranges stored in the respective SwWrongList
do
@@ -986,7 +986,7 @@ static void lcl_DrawLineForWrongListData(
while (nWrLen && pWList->Check( nStart, nWrLen ));
if (bColSave)
- rInf.GetOut().SetTextLineColor( aCol );
+ rInf.GetOut().SetLineColor( aCol );
if (rInf.GetOut().GetConnectMetaFile())
rInf.GetOut().Pop();
@@ -1906,10 +1906,10 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
WRONG_SHOW_MEDIUM < nHght ? WAVE_NORMAL :
( WRONG_SHOW_SMALL < nHght ? WAVE_SMALL :
WAVE_FLAT );
- Color aCol( rInf.GetOut().GetTextLineColor() );
+ Color aCol( rInf.GetOut().GetLineColor() );
BOOL bColSave = aCol != *pWaveCol;
if ( bColSave )
- rInf.GetOut().SetTextLineColor( *pWaveCol );
+ rInf.GetOut().SetLineColor( *pWaveCol );
Point aEnd;
long nKernVal = pKernArray[ USHORT( rInf.GetLen() - 1 ) ];
@@ -1956,7 +1956,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
rInf.GetOut().DrawWaveLine( aCurrPos, aEnd, nWave );
if ( bColSave )
- rInf.GetOut().SetTextLineColor( aCol );
+ rInf.GetOut().SetLineColor( aCol );
if ( rInf.GetOut().GetConnectMetaFile() )
rInf.GetOut().Pop();
@@ -2797,7 +2797,7 @@ sal_Bool SwDrawTextInfo::ApplyAutoColor( Font* pFont )
if ( COL_BLACK != rFnt.GetColor().GetColor() )
bChgFntColor = sal_True;
- if ( (COL_BLACK != GetOut().GetTextLineColor().GetColor()) ||
+ if ( (COL_BLACK != GetOut().GetLineColor().GetColor()) ||
(COL_BLACK != GetOut().GetOverlineColor().GetColor()) )
bChgLineColor = sal_True;
}
@@ -2894,8 +2894,8 @@ sal_Bool SwDrawTextInfo::ApplyAutoColor( Font* pFont )
{
// get current font color or color set at output device
aNewColor = pFont ? pFont->GetColor() : GetOut().GetFont().GetColor();
- if ( aNewColor != GetOut().GetTextLineColor() )
- GetOut().SetTextLineColor( aNewColor );
+ if ( aNewColor != GetOut().GetLineColor() )
+ GetOut().SetLineColor( aNewColor );
if ( aNewColor != GetOut().GetOverlineColor() )
GetOut().SetOverlineColor( aNewColor );
}
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 294f705..5aa9d22 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -498,8 +498,14 @@ Reference<XTextRange> lcl_ExportHints(SwpHints* pHints,
rePortionType = PORTION_TEXT;
break;
case RES_TXTATR_CJK_RUBY:
+ //#i91534# GetEnd() == 0 mixes the order of ruby start/end
+ if( *pAttr->GetEnd() == *pAttr->GetStart())
+ {
+ lcl_InsertRubyPortion(
+ rPortionArr, pUnoCrsr, rParent, pAttr, sal_False);
+ }
lcl_InsertRubyPortion(
- rPortionArr, pUnoCrsr, rParent, pAttr, TRUE);
+ rPortionArr, pUnoCrsr, rParent, pAttr, TRUE);
rePortionType = PORTION_TEXT;
break;
}
@@ -619,7 +625,8 @@ Reference<XTextRange> lcl_ExportHints(SwpHints* pHints,
}
break;
case RES_TXTATR_CJK_RUBY:
- if(pAttr->GetEnd())
+ //#i91534# GetEnd() == 0 mixes the order of ruby start/end
+ if(pAttr->GetEnd() && (*pAttr->GetEnd() != *pAttr->GetStart()))
{
lcl_InsertRubyPortion(
rPortionArr, pUnoCrsr, rParent, pAttr, FALSE);
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 683d8bd..16a6440 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -201,6 +201,9 @@ SfxItemSet* SwModule::CreateItemSet( USHORT nId )
aLang >>= aLocale;
pRet->Put(SvxLanguageItem(SvxLocaleToLanguage( aLocale ), SID_ATTR_CHAR_CJK_LANGUAGE));
+ aLang = aLinguCfg.GetProperty(C2U("DefaultLocale_CTL"));
+ aLang >>= aLocale;
+ pRet->Put(SvxLanguageItem(SvxLocaleToLanguage( aLocale ), SID_ATTR_CHAR_CTL_LANGUAGE));
}
if(bTextDialog)
pRet->Put(SwPtrItem(FN_PARAM_STDFONTS, GetStdFontConfig()));
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index a77a1e3..56a8af1 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -802,7 +802,8 @@ IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton)
{
bool bDown = pButton == &m_aDownPB;
BOOL bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 );
- m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
+ if (bMoved || bDown)
+ m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
if(!bMoved && bDown)
{
//insert a new paragraph before the greeting line
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 626442a..dd9f07e 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -428,6 +428,8 @@ SwMailMergeOutputPage::SwMailMergeOutputPage( SwMailMergeWizard* _pParent) :
m_aSendAllRB.SetClickHdl(LINK(this, SwMailMergeOutputPage, DocumentSelectionHdl_Impl));
m_aFromRB.SetClickHdl(LINK(this, SwMailMergeOutputPage, DocumentSelectionHdl_Impl));
+ //#i63267# printing might be disabled
+ m_aPrintRB.Enable(!Application::GetSettings().GetMiscSettings().GetDisablePrinting());
}
/*-- 02.04.2004 13:15:44---------------------------------------------------
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index e874e99..a7413d3 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -561,10 +561,14 @@ sal_Bool SwTransferable::GetData( const DATA_FLAVOR& rFlavor )
break;
case SOT_FORMAT_STRING:
- bOK = SetObject( pClpDocFac->GetDoc(),
+ {
+ SwDoc* pDoc = pClpDocFac->GetDoc();
+ ASSERT( pDoc, "Document not found" );
+ pDoc->SetClipBoard( true );
+ bOK = SetObject( pDoc,
SWTRANSFER_OBJECTTYPE_STRING, rFlavor );
- break;
-
+ }
+ break;
case SOT_FORMAT_RTF:
bOK = SetObject( pClpDocFac->GetDoc(),
SWTRANSFER_OBJECTTYPE_RTF, rFlavor );
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index d4b476f..56ddbf3 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -35,44 +35,27 @@
#endif
-#ifndef _MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
+#include <vcl/svapp.hxx>
#include <tools/urlobj.hxx>
#include <svtools/urihelper.hxx>
#include <svtools/pathoptions.hxx>
#include <goodies/mailenum.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#ifndef _HELPID_H
#include <helpid.h>
-#endif
-#ifndef _VIEW_HXX
#include <view.hxx>
-#endif
-#ifndef _DOCSH_HXX
#include <docsh.hxx>
-#endif
-#ifndef IDOCUMENTDEVICEACCESS_HXX_INCLUDED
#include <IDocumentDeviceAccess.hxx>
-#endif
#include <wrtsh.hxx>
-#ifndef _DBMGR_HXX
#include <dbmgr.hxx>
-#endif
#include <dbui.hxx>
#include <prtopt.hxx>
#include <swmodule.hxx>
-#ifndef _MODCFG_HXX
#include <modcfg.hxx>
-#endif
#include <mailmergehelper.hxx>
-#ifndef _ENVELP_HRC
#include <envelp.hrc>
-#endif
-#ifndef _MAILMRGE_HRC
#include <mailmrge.hrc>
-#endif
#include <mailmrge.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
@@ -83,9 +66,7 @@
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdb/XResultSetAccess.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/unohlp.hxx>
-#endif
#include <comphelper/processfactory.hxx>
#include <com/sun/star/form/XFormController.hpp>
#include <cppuhelper/implbase1.hxx>
@@ -384,8 +365,12 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
aPrinterRB.SetClickHdl(aLk);
aMailingRB.SetClickHdl(aLk);
aFileRB.SetClickHdl(aLk);
- OutputTypeHdl(&aPrinterRB);
+ //#i63267# printing might be disabled
+ bool bIsPrintable = !Application::GetSettings().GetMiscSettings().GetDisablePrinting();
+ aPrinterRB.Enable(bIsPrintable);
+ OutputTypeHdl(bIsPrintable ? &aPrinterRB : &aFileRB);
+
aLk = LINK(this, SwMailMergeDlg, FilenameHdl);
aGenerateFromDataBaseCB.SetClickHdl( aLk );
BOOL bColumn = pModOpt->IsNameFromColumn();
diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx
index 0e04eb9..59bdf3d 100644
--- a/sw/source/ui/inc/convert.hxx
+++ b/sw/source/ui/inc/convert.hxx
@@ -63,14 +63,14 @@ class SwConvertTableDlg: public SfxModalDialog
FixedText aRepeatHeaderAfterFT;
TextControlCombo aRepeatHeaderCombo;
+ FixedLine aOptionsFL;
CheckBox aDontSplitCB;
CheckBox aBorderCB;
- FixedLine aOptionsFL;
+ PushButton aAutoFmtBtn;
OKButton aOkBtn;
CancelButton aCancelBtn;
HelpButton aHelpBtn;
- PushButton aAutoFmtBtn;
String sConvertTextTable;
SwTableAutoFmt* pTAutoFmt;
diff --git a/sw/source/ui/ribbar/conrect.cxx b/sw/source/ui/ribbar/conrect.cxx
index 6a5eda8..2bd5796 100644
--- a/sw/source/ui/ribbar/conrect.cxx
+++ b/sw/source/ui/ribbar/conrect.cxx
@@ -163,15 +163,17 @@ BOOL ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
break;
case OBJ_CAPTION:
- if( bCapVertical && pObj )
+ {
+ SdrCaptionObj* pCaptObj = dynamic_cast<SdrCaptionObj*>(pObj);
+ if( bCapVertical && pCaptObj )
{
- SdrCaptionObj* pCaptObj = (SdrCaptionObj*)pObj;
pCaptObj->ForceOutlinerParaObject();
OutlinerParaObject* pOPO = pCaptObj->GetOutlinerParaObject();
if( pOPO && !pOPO->IsVertical() )
pOPO->SetVertical( TRUE );
}
- break;
+ }
+ break;
default:; //prevent warning
}
}
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 5946c1f..8b80758 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -141,14 +141,14 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
aRepeatHeaderAfterFT (this),
aRepeatHeaderCombo (this, SW_RES(WIN_REPEAT_HEADER), aRepeatHeaderNF, aRepeatHeaderBeforeFT, aRepeatHeaderAfterFT),
+ aOptionsFL (this, SW_RES(FL_OPTIONS)),
aDontSplitCB (this, SW_RES(CB_DONT_SPLIT)),
aBorderCB (this, SW_RES(CB_BORDER)),
- aOptionsFL (this, SW_RES(FL_OPTIONS)),
+ aAutoFmtBtn(this,SW_RES(BT_AUTOFORMAT)),
aOkBtn(this,SW_RES(BT_OK)),
aCancelBtn(this,SW_RES(BT_CANCEL)),
aHelpBtn(this, SW_RES(BT_HELP)),
- aAutoFmtBtn(this,SW_RES(BT_AUTOFORMAT)),
#ifdef MSC
#pragma warning (default : 4355)
#endif
diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src
index 0ce0743..4da0510 100644
--- a/sw/source/ui/table/convert.src
+++ b/sw/source/ui/table/convert.src
@@ -36,7 +36,7 @@ ModalDialog DLG_CONV_TEXT_TABLE
{
HelpID = FN_CONVERT_TEXT_TABLE ;
OUTPUTSIZE = TRUE ;
- Size = MAP_APPFONT ( 203 , 152 ) ;
+ Size = MAP_APPFONT ( 203 , 169 ) ;
Text [ en-US ] = "Convert Table to Text" ;
MOVEABLE = TRUE ;
SVLOOK = TRUE ;
@@ -176,8 +176,8 @@ ModalDialog DLG_CONV_TEXT_TABLE
};
PushButton BT_AUTOFORMAT
{
- Pos = MAP_APPFONT ( 147 , 60 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 12 , 152 ) ;
+ Size = MAP_APPFONT ( 66 , 14 ) ;
TabStop = TRUE ;
Hide = TRUE ;
Text [ en-US ] = "Auto~Format..." ;
commit 5a58a32b4824c4d6d1b5455bd0533364f1d0432c
Author: Release Engineers <releng at openoffice.org>
Date: Fri Jul 3 09:36:46 2009 +0000
#i10000# fix for hb18 merge
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 7b7f0e7..7997d24 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -282,12 +282,10 @@ void SwWW8Writer::ExportPoolItemsToCHP(sw::PoolItems &rItems, USHORT nScript)
{
const SfxPoolItem *pItem = aI->second;
USHORT nWhich = pItem->Which();
- if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
+ if (!isCHRATR(nWhich) && !isTXTATR(nWhich))
continue;
if (FnAttrOut pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN])
{
- if (!isCHRATR(nWhich) && !isTXTATR(nWhich))
- continue;
if (SwWW8Writer::CollapseScriptsforWordOk(nScript, nWhich))
(*pOut)(*this, *pItem);
}
More information about the ooo-build-commit
mailing list