[Libreoffice-commits] core.git: 2 commits - sw/source test/source toolkit/source tools/source ucb/qa udkapi/com unotools/source uui/source
Justin Luth
justin_luth at sil.org
Mon Sep 4 09:05:11 UTC 2017
sw/source/core/layout/paintfrm.cxx | 5 ++---
test/source/sheet/xnamedranges.cxx | 2 +-
toolkit/source/awt/vclxtoolkit.cxx | 4 ++--
toolkit/source/awt/vclxwindow.cxx | 2 +-
toolkit/source/controls/stdtabcontroller.cxx | 2 +-
toolkit/source/controls/unocontrolmodel.cxx | 2 +-
toolkit/source/helper/property.cxx | 2 +-
toolkit/source/helper/unowrapper.cxx | 2 +-
tools/source/generic/poly.cxx | 2 +-
tools/source/stream/stream.cxx | 2 +-
tools/source/string/tenccvt.cxx | 2 +-
ucb/qa/complex/tdoc/_XServiceInfo.java | 2 +-
udkapi/com/sun/star/script/XLibraryAccess.idl | 2 +-
unotools/source/config/dynamicmenuoptions.cxx | 6 +++---
unotools/source/streaming/streamwrap.cxx | 2 +-
uui/source/secmacrowarnings.hxx | 2 +-
16 files changed, 20 insertions(+), 21 deletions(-)
New commits:
commit de0993097cad2fd5819f8bea5ff53cddce7cde41
Author: Justin Luth <justin_luth at sil.org>
Date: Wed Aug 30 18:08:15 2017 -0400
tdf#104602: don't re-draw page background when bOnlyTextBackground
In 2014 Writer gained support for Paragraph and PageStyle DrawingLayer
FillAttributes, it changed some behaviour with PaintBackground,
so that compat setting BACKGROUND_PARA_OVER_DRAWINGS now overwrote
the entire "hell" layer as the page background was re-applied.
Only DOCX uses this 2012 compatibility setting.
Change-Id: I69517efb7d82acd719d6a27a09ba61554dbf1ec9
Reviewed-on: https://gerrit.libreoffice.org/41744
Reviewed-by: Justin Luth <justin_luth at sil.org>
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index b78c230137de..f88d84a6a6f0 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6510,7 +6510,7 @@ void SwFrame::PaintBackground( const SwRect &rRect, const SwPageFrame *pPage,
if( IsTextFrame() || IsSctFrame() )
aPaintRect = UnionFrame( true );
- if ( aPaintRect.IsOver( rRect ) )
+ if ( (!bOnlyTextBackground || IsTextFrame()) && aPaintRect.IsOver( rRect ) )
{
if ( bBack || bPageFrame || !bLowerMode )
{
@@ -6604,7 +6604,6 @@ void SwFrame::PaintBackground( const SwRect &rRect, const SwPageFrame *pPage,
// background transparency have to be considered
// Set missing 5th parameter to the default value GRFNUM_NO
// - see declaration in /core/inc/frmtool.hxx.
- if (IsTextFrame() || !bOnlyTextBackground)
::DrawGraphic(
pItem,
pOut,
@@ -6649,7 +6648,7 @@ void SwFrame::PaintBackground( const SwRect &rRect, const SwPageFrame *pPage,
if ( ( pFrame->IsLayoutFrame() && bLowerBorder ) ||
aFrameRect.IsOver( aRect ) )
pFrame->PaintBackground( aRect, pPage, rTmpAttrs, bLowMode,
- bLowerBorder );
+ bLowerBorder, bOnlyTextBackground );
if ( bLowerBorder )
pFrame->PaintBorder( aBorderRect, pPage, rTmpAttrs );
}
commit 75a96e22fd162a9410333698f57e4302ae190e66
Author: Johnny_M <klasse at partyheld.de>
Date: Sat Sep 2 13:06:09 2017 +0200
Translate German comments/debug strings (leftovers in dirs test to uui)
Translates leftovers found using a custom regex.
Additionally:
- A few spelling fixes
Change-Id: I3772e1b914acc487d80ab14efb815cb178ca3dcb
Reviewed-on: https://gerrit.libreoffice.org/41831
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/test/source/sheet/xnamedranges.cxx b/test/source/sheet/xnamedranges.cxx
index 6983ead594d1..0b288dcab3c6 100644
--- a/test/source/sheet/xnamedranges.cxx
+++ b/test/source/sheet/xnamedranges.cxx
@@ -160,7 +160,7 @@ void XNamedRanges::testRemoveByName()
uno::Reference< container::XIndexAccess > xIndex(xNamedRanges, UNO_QUERY_THROW);
bool bHasIt = xNamedRanges->hasByName(maNameToRemove);
- CPPUNIT_ASSERT_MESSAGE("NamedRange initial1 des not exits, can't remove it", bHasIt);
+ CPPUNIT_ASSERT_MESSAGE("NamedRange initial1 does not exist, can't remove it", bHasIt);
if (bHasIt)
{
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 9076ae37f259..8cc6e382c35f 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -811,8 +811,8 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
}
if ( !pParent )
{
- // Wenn die Component einen Parent braucht, dann NULL zurueckgeben,
- // spaeter mal css::uno::Exception...
+ // If the component needs a parent, then return NULL,
+ // some time later css::uno::Exception...
bool bException = true;
if ( ( nType == WindowType::DIALOG )
|| ( nType == WindowType::MODALDIALOG )
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 41e5168e03f4..cdf2a17246da 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -657,7 +657,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
CommandEvent* pCmdEvt = static_cast<CommandEvent*>(rVclWindowEvent.GetData());
if ( mpImpl->getMouseListeners().getLength() && ( pCmdEvt->GetCommand() == CommandEventId::ContextMenu ) )
{
- // CommandEventId::ContextMenu als mousePressed mit PopupTrigger = sal_True versenden...
+ // CommandEventId::ContextMenu: send as mousePressed with PopupTrigger = true ...
Point aWhere = static_cast< CommandEvent* >( rVclWindowEvent.GetData() )->GetMousePosPixel();
if ( !pCmdEvt->IsMouseEvent() )
{ // for keyboard events, we set the coordinates to -1,-1. This is a slight HACK, but the current API
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index d290f413dce0..967113a46602 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -386,7 +386,7 @@ css::uno::Sequence<OUString> StdTabController::getSupportedServiceNames()
Reference< XControl > StdTabController::FindControl( Sequence< Reference< XControl > >& rCtrls,
const Reference< XControlModel > & rxCtrlModel )
{
- DBG_ASSERT( rxCtrlModel.is(), "ImplFindControl - welches ?!" );
+ DBG_ASSERT( rxCtrlModel.is(), "ImplFindControl - which one ?!" );
const Reference< XControl > * pCtrls = rCtrls.getConstArray();
sal_Int32 nCtrls = rCtrls.getLength();
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 7934b320b007..5697e1034d6d 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -525,7 +525,7 @@ OUString UnoControlModel::getServiceName( )
{
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
- OSL_FAIL( "ServiceName von UnoControlModel ?!" );
+ OSL_FAIL( "ServiceName of UnoControlModel ?!" );
return OUString();
}
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index a4b65311e9af..09552b6fe4e5 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -138,7 +138,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
DECL_PROP_2 ( "FontEmphasisMark", FONTEMPHASISMARK, sal_Int16, BOUND, MAYBEDEFAULT ),
DECL_PROP_2 ( "FontDescriptor", FONTDESCRIPTOR, FontDescriptor, BOUND, MAYBEDEFAULT ),
- // Teile des css::awt::FontDescriptor
+ // parts of css::awt::FontDescriptor
DECL_PROP_2 ( "FontName", FONTDESCRIPTORPART_NAME, OUString,BOUND, MAYBEDEFAULT ),
DECL_PROP_2 ( "FontStyleName", FONTDESCRIPTORPART_STYLENAME, OUString,BOUND, MAYBEDEFAULT ),
DECL_PROP_2 ( "FontFamily", FONTDESCRIPTORPART_FAMILY, sal_Int16, BOUND, MAYBEDEFAULT ),
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 285ab210631c..0eac53e787c1 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -232,7 +232,7 @@ void UnoWrapper::WindowDestroyed( vcl::Window* pWindow )
pChild = pNextChild;
}
- // System-Windows suchen...
+ // find system windows...
VclPtr< vcl::Window > pOverlap = pWindow->GetWindow( GetWindowType::Overlap );
if ( pOverlap )
{
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 74e265bdb01f..0cdc61f91b65 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -179,7 +179,7 @@ void ImplPolygon::ImplSetSize( sal_uInt16 nNewSize, bool bResize )
if ( mpPointAry )
delete[] reinterpret_cast<char*>(mpPointAry);
- // ggf. FlagArray beruecksichtigen
+ // take FlagArray into account, if applicable
if( mpFlagAry )
{
PolyFlags* pNewFlagAry;
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 590e13655bc8..a45fce1159f2 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1464,7 +1464,7 @@ std::size_t SvStream::CryptAndWriteBuffer( const void* pStart, std::size_t nLen)
nBufCount = nLen;
nLen -= nBufCount;
memcpy( pTemp, pDataPtr, (sal_uInt16)nBufCount );
- // **** Verschluesseln *****
+ // ******** Encrypt ********
for (unsigned char & rn : pTemp)
{
unsigned char aCh = rn;
diff --git a/tools/source/string/tenccvt.cxx b/tools/source/string/tenccvt.cxx
index 528608eceef1..152200a353bf 100644
--- a/tools/source/string/tenccvt.cxx
+++ b/tools/source/string/tenccvt.cxx
@@ -44,7 +44,7 @@ rtl_TextEncoding GetExtendedTextEncoding( rtl_TextEncoding eEncoding )
// East-Europe - Latin2
else if ( eEncoding == RTL_TEXTENCODING_ISO_8859_2 )
return RTL_TEXTENCODING_MS_1250;
- // Latin-15 - Latin 1 mit Euro-Sign
+ // Latin-15 - Latin 1 with euro sign
else if ( eEncoding == RTL_TEXTENCODING_ISO_8859_15 )
return RTL_TEXTENCODING_MS_1252;
else
diff --git a/ucb/qa/complex/tdoc/_XServiceInfo.java b/ucb/qa/complex/tdoc/_XServiceInfo.java
index 569323b2607a..7104e0ee27d2 100644
--- a/ucb/qa/complex/tdoc/_XServiceInfo.java
+++ b/ucb/qa/complex/tdoc/_XServiceInfo.java
@@ -45,7 +45,7 @@ public class _XServiceInfo {
boolean result = true;
log.println("testing getImplementationName() ... ");
- log.println("The ImplementationName ist "+oObj.getImplementationName());
+ log.println("The ImplementationName is "+oObj.getImplementationName());
result=true;
return result;
diff --git a/udkapi/com/sun/star/script/XLibraryAccess.idl b/udkapi/com/sun/star/script/XLibraryAccess.idl
index 0fde430840df..d077cd38030c 100644
--- a/udkapi/com/sun/star/script/XLibraryAccess.idl
+++ b/udkapi/com/sun/star/script/XLibraryAccess.idl
@@ -59,7 +59,7 @@ published interface XLibraryAccess: com::sun::star::uno::XInterface
*/
string getModuleSource( [in] string aModulName );
- /** Get the hole compiled code of a module.
+ /** Get the whole compiled code of a module.
@param aModuleName the full qualified name of a module.
(e.g., "UtilLibrary.ModuleDate")
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index d0ceb86c61ea..a1e87e953ab0 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -267,18 +267,18 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl()
// first "New" menu ...
// Name Value
// /New/1/URL "private:factory/swriter"
- // /New/1/Title "Neues Writer Dokument"
+ // /New/1/Title "New Writer Document"
// /New/1/ImageIdentifier "icon_writer"
// /New/1/TargetName "_blank"
// /New/2/URL "private:factory/scalc"
- // /New/2/Title "Neues Calc Dokument"
+ // /New/2/Title "New Calc Document"
// /New/2/ImageIdentifier "icon_calc"
// /New/2/TargetName "_blank"
// second "Wizard" menu ...
// /Wizard/1/URL "file://b"
- // /Wizard/1/Title "MalWas"
+ // /Wizard/1/Title "PaintSomething"
// /Wizard/1/ImageIdentifier "icon_?"
// /Wizard/1/TargetName "_self"
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index d0aa67e55f3e..cf54a1cf48ce 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -64,7 +64,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >
sal_uInt32 nRead = m_pSvStream->ReadBytes(static_cast<void*>(aData.getArray()), nBytesToRead);
checkError();
- // Wenn gelesene Zeichen < MaxLength, css::uno::Sequence anpassen
+ // If read characters < MaxLength, adjust css::uno::Sequence
if (nRead < (std::size_t)aData.getLength())
aData.realloc( nRead );
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index b94a8baeb3c1..62517709d66b 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -52,7 +52,7 @@ private:
VclPtr<PushButton> mpEnableBtn;
VclPtr<PushButton> mpDisableBtn;
- const bool mbSignedMode; // modus of dialog (signed / unsigned macros)
+ const bool mbSignedMode; // mode of dialog (signed / unsigned macros)
const bool mbShowSignatures;
sal_Int32 mnActSecLevel;
More information about the Libreoffice-commits
mailing list