[Libreoffice-commits] core.git: 2 commits - basctl/source extensions/source filter/source framework/source sal/inc sc/source sfx2/source svl/source svtools/source tools/source unotools/source vcl/source
Thomas Arnhold
thomas at arnhold.org
Sat Feb 23 04:35:39 PST 2013
basctl/source/basicide/basobj2.cxx | 2
extensions/source/plugin/base/context.cxx | 2
filter/source/msfilter/msdffimp.cxx | 2
framework/source/classes/fwktabwindow.cxx | 6 +-
sal/inc/sal/log-areas.dox | 39 ++++++++++++-
sc/source/ui/view/formatsh.cxx | 16 ++---
sc/source/ui/view/reffact.cxx | 4 -
sc/source/ui/view/select.cxx | 70 +++++++++++--------------
sfx2/source/appl/shutdownicon.cxx | 2
svl/source/items/srchitem.cxx | 2
svtools/source/config/accessibilityoptions.cxx | 38 ++++++-------
svtools/source/config/printoptions.cxx | 31 +++++------
svtools/source/contnr/DocumentInfoPreview.cxx | 2
svtools/source/misc/embedhlp.cxx | 2
svtools/source/misc/langtab.cxx | 2
tools/source/datetime/tdate.cxx | 2
tools/source/rc/resmgr.cxx | 2
unotools/source/config/historyoptions.cxx | 19 ++----
unotools/source/config/useroptions.cxx | 6 +-
unotools/source/misc/fontcvt.cxx | 2
unotools/source/ucbhelper/ucbhelper.cxx | 26 ++++-----
vcl/source/control/button.cxx | 2
vcl/source/gdi/pngread.cxx | 2
23 files changed, 149 insertions(+), 132 deletions(-)
New commits:
commit c4cc63badc506a00ee92e588d47e4f93e22fe1b5
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Feb 23 13:31:09 2013 +0100
sal: update log areas
Change-Id: Id7b2c7e871abf19b70f427095371c6a6c0208607
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 6fac397..7e62558 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -199,7 +199,7 @@ bool RenameModule (
// update tabwriter
sal_uInt16 nId = pShell->GetWindowId( pWin );
- SAL_WARN_IF( nId == 0 , "basctl.basicide ", "No entry in Tabbar!");
+ SAL_WARN_IF( nId == 0 , "basctl.basicide", "No entry in Tabbar!");
if ( nId )
{
TabBar& rTabBar = pShell->GetTabBar();
diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx
index fa504aa..4e153ca 100644
--- a/extensions/source/plugin/base/context.cxx
+++ b/extensions/source/plugin/base/context.cxx
@@ -339,7 +339,7 @@ void FileSink::writeBytes( const Sequence<sal_Int8>& Buffer ) throw()
{
size_t nItems = Buffer.getLength();
bool bSuccess = (fwrite(Buffer.getConstArray(), 1, nItems, fp) == nItems);
- SAL_WARN_IF( !bSuccess, "extensions", "short write");
+ SAL_WARN_IF( !bSuccess, "extensions.plugin", "short write");
}
}
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 9cc9f06..18247bf 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5435,7 +5435,7 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL )
{
sal_Size nMaxEntriesPossible = rStCtrl.remainingSize() / nFIDCLsize;
SAL_WARN_IF(nMaxEntriesPossible < mnIdClusters,
- "escher", "FIDCL list longer than remaining bytes, ppt or parser is wrong");
+ "filter.ms", "FIDCL list longer than remaining bytes, ppt or parser is wrong");
mnIdClusters = std::min(nMaxEntriesPossible, static_cast<sal_Size>(mnIdClusters));
maFidcls.resize(mnIdClusters);
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 323f4b4..a9b2aaa 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -63,7 +63,7 @@ void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
ImplCallEventListeners( nEvent, (void*)(sal_uIntPtr)GetCurPageId() );
else
{
- SAL_WARN( "framework", "FwkTabControl::BroadcastEvent(): illegal event" );
+ SAL_WARN( "fwk", "FwkTabControl::BroadcastEvent(): illegal event" );
}
}
@@ -122,11 +122,11 @@ void FwkTabPage::CreateDialog()
}
catch ( const lang::IllegalArgumentException& )
{
- SAL_WARN( "framework", "FwkTabPage::CreateDialog(): illegal argument" );
+ SAL_WARN( "fwk", "FwkTabPage::CreateDialog(): illegal argument" );
}
catch ( const uno::Exception& )
{
- SAL_WARN( "framework", "FwkTabPage::CreateDialog(): exception of XDialogProvider2::createContainerWindow()" );
+ SAL_WARN( "fwk", "FwkTabPage::CreateDialog(): exception of XDialogProvider2::createContainerWindow()" );
}
}
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index ef110e8..a047767 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -29,6 +29,11 @@ certain functionality.
@li @c basctl.basicide
+ at section basic
+
+ at li @c basic
+ at li @c basic.sbx
+
@section canvas
@li @c canvas
@@ -85,6 +90,7 @@ certain functionality.
@section extensions
@li @c extensions.plugin
+ at li @c extensions.update
@li @c extensions.scanner
@section Filter
@@ -104,6 +110,12 @@ certain functionality.
@li @c fpicker.aqua
@li @c fpicker.office
+ at section framework
+
+ at li @c fwk - framework
+ at li @c fwk.desktop
+ at li @c fwk.session
+
@section i18npool
@li @c i18npool - general i18npool
@@ -143,6 +155,7 @@ certain functionality.
@section slideshow
@li @c slideshow.opengl
+ at li @c slideshow.eventqueue
@section svl
@@ -157,17 +170,25 @@ certain functionality.
@li @c svtools.dialogs
@li @c svtools.filter
@li @c svtools.misc
+ at li @c svtools.table
@li @c svtools.uno
@section svx
@li @c svx.dialog
@li @c svx.form
+ at li @c svx.stbcrtls
+ at li @c svx.table
@li @c svx.tbxcrtls
+ at section toolkit
+
+ at li @c toolkit.controls
+
@section tools
@li @c tools.debug
+ at li @c tools.datetime
@li @c tools.memtools
@li @c tools.rc - resource manager
@li @c tools.stream - SvStream class
@@ -181,19 +202,31 @@ certain functionality.
@li @c unotools.config
@li @c unotools.i18n
+ at li @c unotools.misc
+ at li @c unotools.ucbhelper
@section URE
@li @c rtl.string - ::rtl::OString, ::rtl::OUString, and related functionality
@li @c salhelper.thread - ::salhelper::Thread class
+ at section sax
+
+ at li @c sax.cppunit
+
@section stoc
@li @c stoc.corerefl
@li @c stoc.tdmanager
+ at section svl
+
+ at li @c svl.items
+
@section VCL
+ at li @c vcl
+ at li @c vcl.a11y
@li @c vcl.atsui - ATSUI (obsolete) -using code for Mac OS X
@li @c vcl.control
@li @c vcl.coretext - CoreText-using code for Mac OS X and iOS
@@ -202,7 +235,6 @@ certain functionality.
@li @c vcl.layout - Widget layout
@li @c vcl.sm
-
@section Writer
@li @c sw
@@ -236,7 +268,6 @@ certain functionality.
@li @c accessibility
@li @c avmedia
@li @c basebmp
- at li @c basic
@li @c binaryurp
@li @c bridges
@li @c comphelper
@@ -244,8 +275,9 @@ certain functionality.
@li @c cppcanvas
@li @c cppuhelper
@li @c cppu
+ at li @c dbaccess
@li @c editeng
- at li @c framework
+ at li @c forms
@li @c helpcompiler
@li @c jvmfwk
@li @c linguistic
@@ -254,6 +286,7 @@ certain functionality.
@li @c sax
@li @c shell
@li @c stoc
+ at li @c svg
@li @c svx
@li @c ucbhelper
@li @c xmlhelp
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index bcb85ce..868b396 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -664,7 +664,7 @@ void SAL_CALL ShutdownIcon::disposing( const ::com::sun::star::lang::EventObject
void SAL_CALL ShutdownIcon::queryTermination( const ::com::sun::star::lang::EventObject& )
throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException)
{
- SAL_INFO("sfx2.shutdown", "ShutdownIcon::queryTermination: veto is " << m_bVeto);
+ SAL_INFO("sfx2.appl", "ShutdownIcon::queryTermination: veto is " << m_bVeto);
::osl::ClearableMutexGuard aGuard( m_aMutex );
if ( m_bVeto )
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index ca00d5a..9567170 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -436,7 +436,7 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
}
default:
- SAL_WARN( "svl.ui", "SvxSearchItem::QueryValue(): Unknown MemberId" );
+ SAL_WARN( "svl.items", "SvxSearchItem::QueryValue(): Unknown MemberId" );
return false;
}
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 92ed2bd..4bc1653 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -122,7 +122,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl()
catch(const css::uno::Exception& ex)
{
m_xCfg.clear();
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -143,7 +143,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC()
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -161,7 +161,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
}
@@ -178,7 +178,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -196,7 +196,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -214,7 +214,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -232,7 +232,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -250,7 +250,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsSystemFont() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -268,7 +268,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return nRet;
@@ -286,7 +286,7 @@ sal_Bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -308,7 +308,7 @@ void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet)
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -328,7 +328,7 @@ void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(sal_Bool bSet)
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -348,7 +348,7 @@ void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(sal_Bool bSet)
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -368,7 +368,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(sal_Bool bSet)
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -388,7 +388,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(sal_Bool bSet)
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -408,7 +408,7 @@ void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(sal_Bool bSet)
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -428,7 +428,7 @@ void SvtAccessibilityOptions_Impl::SetIsSystemFont(sal_Bool bSet)
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -448,7 +448,7 @@ void SvtAccessibilityOptions_Impl::SetHelpTipSeconds(sal_Int16 nSet)
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -468,7 +468,7 @@ void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(sal_Bool bSet)
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 84ba19d..e67ddfd 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -25,11 +25,8 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-
#include <com/sun/star/container/XNameAccess.hpp>
-
#include <com/sun/star/container/XNameContainer.hpp>
-
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <comphelper/configurationhelper.hxx>
@@ -174,7 +171,7 @@ SvtPrintOptions_Impl::SvtPrintOptions_Impl(const OUString& rConfigRoot)
{
m_xNode.clear();
m_xCfg.clear();
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -192,7 +189,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceTransparency() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -212,7 +209,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedTransparencyMode() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return nRet;
@@ -234,7 +231,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceGradients() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -256,7 +253,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientMode() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return nRet;
@@ -278,7 +275,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedGradientStepCount() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return nRet;
@@ -300,7 +297,7 @@ sal_Bool SvtPrintOptions_Impl::IsReduceBitmaps() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -322,7 +319,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapMode() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return nRet;
@@ -344,7 +341,7 @@ sal_Int16 SvtPrintOptions_Impl::GetReducedBitmapResolution() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return nRet;
@@ -366,7 +363,7 @@ sal_Bool SvtPrintOptions_Impl::IsReducedBitmapIncludesTransparency() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -388,7 +385,7 @@ sal_Bool SvtPrintOptions_Impl::IsConvertToGreyscales() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -411,7 +408,7 @@ sal_Bool SvtPrintOptions_Impl::IsPDFAsStandardPrintJobFormat() const
}
catch (const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
return bRet;
@@ -502,7 +499,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -530,7 +527,7 @@ void SvtPrintOptions_Impl::impl_setValue (const ::rtl::OUString& sProp,
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("svtools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message);
}
}
diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx
index 0f2177a..4d12ce9 100644
--- a/svtools/source/contnr/DocumentInfoPreview.cxx
+++ b/svtools/source/contnr/DocumentInfoPreview.cxx
@@ -112,7 +112,7 @@ void ODocumentInfoPreview::fill(
value = conv->convertToSimpleType(aAny, css::uno::TypeClass_STRING).
get< rtl::OUString >();
} catch (css::script::CannotConvertException & e) {
- SAL_INFO("svtools", "ignored CannotConvertException " << e.Message);
+ SAL_INFO("svtools.contr", "ignored CannotConvertException " << e.Message);
}
if (!value.isEmpty()) {
insertEntry(name, value);
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 07b90d4..ad57f9f 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -584,7 +584,7 @@ SvStream* EmbeddedObjectRef::GetGraphicStream( bool bUpdate ) const
}
catch (const uno::Exception& ex)
{
- SAL_WARN("svtools", "discarding broken embedded object preview: " << ex.Message);
+ SAL_WARN("svtools.misc", "discarding broken embedded object preview: " << ex.Message);
delete pStream;
xStream.clear();
}
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 0efffcf..910cbe9 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -144,7 +144,7 @@ const rtl::OUString SvtLanguageTable::GetString( const LanguageType eType, bool
//Rather than return a fairly useless "Unknown" name, return a geeky but usable-in-a-pinch lang-tag
OUString sLangTag(LanguageTag(eType).getBcp47());
- SAL_WARN("svtools", "Language: 0x"
+ SAL_WARN("svtools.misc", "Language: 0x"
<< std::hex << eType
<< " with unknown name, so returning lang-tag of: "
<< sLangTag);
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index f85e751..038a702 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -197,7 +197,7 @@ sal_uInt16 Date::GetWeekOfYear( DayOfWeek eStartDay,
if (nMinimumNumberOfDaysInWeek < 1 || 7 < nMinimumNumberOfDaysInWeek)
{
- SAL_WARN( "tools", "Date::GetWeekOfYear: invalid nMinimumNumberOfDaysInWeek" );
+ SAL_WARN( "tools.datetime", "Date::GetWeekOfYear: invalid nMinimumNumberOfDaysInWeek" );
nMinimumNumberOfDaysInWeek = 4;
}
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index d161c65..b962bab 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -861,7 +861,7 @@ void ResMgr::Init( const OUString& rFileName )
InternalResMgr::FreeGlobalRes( aResHandle, pVoid );
else
{
- SAL_WARN("tools", "Wrong version: " << pImpRes->aFileName);
+ SAL_WARN("tools.rc", "Wrong version: " << pImpRes->aFileName);
}
}
#endif
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index aed1f4b..1b19d3e 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -32,15 +32,10 @@
#include "itemholder1.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
-
#include <com/sun/star/container/XNameAccess.hpp>
-
#include <com/sun/star/container/XNameContainer.hpp>
-
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
#include <comphelper/configurationhelper.hxx>
-
#include <comphelper/processfactory.hxx>
using namespace ::std ;
@@ -153,7 +148,7 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl()
m_xCfg.clear();
m_xCommonXCU.clear();
- SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -199,7 +194,7 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory )
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
}
return nSize;
@@ -259,7 +254,7 @@ void SvtHistoryOptions_Impl::impl_truncateList ( EHistoryType eHistory, sal_uInt
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -319,7 +314,7 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory )
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -404,7 +399,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
// ignore such corrupted individual items here, so that at
// least newly added items are successfully reported back
// from this function:
- SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
}
}
assert(nCount <= nLength);
@@ -414,7 +409,7 @@ Sequence< Sequence< PropertyValue > > SvtHistoryOptions_Impl::GetList( EHistoryT
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
}
return seqReturn;
@@ -571,7 +566,7 @@ void SvtHistoryOptions_Impl::AppendItem( EHistoryType eHistory ,
}
catch(const css::uno::Exception& ex)
{
- SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
}
}
diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index 5da6018..fac2eca 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.cxx
@@ -164,7 +164,7 @@ SvtUserOptions::Impl::Impl() :
catch (uno::Exception const& ex)
{
m_xCfg.clear();
- SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
}
}
@@ -182,7 +182,7 @@ OUString SvtUserOptions::Impl::GetToken (sal_uInt16 nToken) const
}
catch (uno::Exception const& ex)
{
- SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
}
}
else
@@ -204,7 +204,7 @@ void SvtUserOptions::Impl::SetToken (sal_uInt16 nToken, OUString const& sToken)
}
catch (uno::Exception const& ex)
{
- SAL_WARN("unotools", "Caught unexpected: " << ex.Message);
+ SAL_WARN("unotools.config", "Caught unexpected: " << ex.Message);
}
}
else
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 6aaef61..a111488 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1357,7 +1357,7 @@ sal_Unicode ConvertChar::RecodeChar( sal_Unicode cChar ) const
if (!strcmp(mpSubsFontName, "OpenSymbol") || (!strcmp(mpSubsFontName, "StarSymbol")))
{
cRetVal = 0xE12C;
- SAL_WARN( "unotools", "Forcing a bullet substition from 0x" <<
+ SAL_WARN( "unotools.misc", "Forcing a bullet substition from 0x" <<
OString::valueOf((sal_Int32)cChar, 16) << " to 0x" <<
OString::valueOf((sal_Int32)cRetVal, 16));
}
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 2961fff..6d00271 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -62,7 +62,7 @@ namespace {
rtl::OUString canonic(rtl::OUString const & url) {
INetURLObject o(url);
- SAL_WARN_IF(o.HasError(), "unotools", "Invalid URL \"" << url << '"');
+ SAL_WARN_IF(o.HasError(), "unotools.ucbhelper", "Invalid URL \"" << url << '"');
return o.GetMainURL(INetURLObject::NO_DECODE);
}
@@ -103,7 +103,7 @@ std::vector<rtl::OUString> getContents(rtl::OUString const & url) {
} catch (css::uno::Exception const &) {
css::uno::Any e(cppu::getCaughtException());
SAL_INFO(
- "unotools",
+ "unotools.ucbhelper",
"getContents(" << url << ") " << e.getValueType().getTypeName()
<< " \"" << e.get<css::uno::Exception>().Message << '"');
return std::vector<rtl::OUString>();
@@ -137,7 +137,7 @@ bool utl::UCBContentHelper::IsDocument(rtl::OUString const & url) {
} catch (css::uno::Exception const &) {
css::uno::Any e(cppu::getCaughtException());
SAL_INFO(
- "unotools",
+ "unotools.ucbhelper",
"UCBContentHelper::IsDocument(" << url << ") "
<< e.getValueType().getTypeName() << " \""
<< e.get<css::uno::Exception>().Message << '"');
@@ -158,7 +158,7 @@ css::uno::Any utl::UCBContentHelper::GetProperty(
} catch (css::uno::Exception const &) {
css::uno::Any e(cppu::getCaughtException());
SAL_INFO(
- "unotools",
+ "unotools.ucbhelper",
"UCBContentHelper::GetProperty(" << url << ", " << property << ") "
<< e.getValueType().getTypeName() << " \""
<< e.get<css::uno::Exception>().Message << '"');
@@ -177,7 +177,7 @@ bool utl::UCBContentHelper::IsFolder(rtl::OUString const & url) {
} catch (css::uno::Exception const &) {
css::uno::Any e(cppu::getCaughtException());
SAL_INFO(
- "unotools",
+ "unotools.ucbhelper",
"UCBContentHelper::IsFolder(" << url << ") "
<< e.getValueType().getTypeName() << " \""
<< e.get<css::uno::Exception>().Message << '"');
@@ -199,7 +199,7 @@ bool utl::UCBContentHelper::GetTitle(
} catch (css::uno::Exception const &) {
css::uno::Any e(cppu::getCaughtException());
SAL_INFO(
- "unotools",
+ "unotools.ucbhelper",
"UCBContentHelper::GetTitle(" << url << ") "
<< e.getValueType().getTypeName() << " \""
<< e.get<css::uno::Exception>().Message << '"');
@@ -221,7 +221,7 @@ bool utl::UCBContentHelper::Kill(rtl::OUString const & url) {
} catch (css::uno::Exception const &) {
css::uno::Any e(cppu::getCaughtException());
SAL_INFO(
- "unotools",
+ "unotools.ucbhelper",
"UCBContentHelper::Kill(" << url << ") "
<< e.getValueType().getTypeName() << " \""
<< e.get<css::uno::Exception>().Message << '"');
@@ -263,7 +263,7 @@ bool utl::UCBContentHelper::MakeFolder(
exists = true;
} else {
SAL_INFO(
- "unotools",
+ "unotools.ucbhelper",
"UCBContentHelper::MakeFolder(" << title
<< ") InteractiveIOException \"" << e.Message
<< "\", code " << +e.Code);
@@ -278,7 +278,7 @@ bool utl::UCBContentHelper::MakeFolder(
} catch (css::uno::Exception const &) {
css::uno::Any e(cppu::getCaughtException());
SAL_INFO(
- "unotools",
+ "unotools.ucbhelper",
"UCBContentHelper::MakeFolder(" << title << ") "
<< e.getValueType().getTypeName() << " \""
<< e.get<css::uno::Exception>().Message << '"');
@@ -298,7 +298,7 @@ sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) {
sal_Int64 n = 0;
bool ok = (content(url).getPropertyValue(rtl::OUString("Size")) >>= n);
SAL_INFO_IF(
- !ok, "unotools",
+ !ok, "unotools.ucbhelper",
"UCBContentHelper::GetSize(" << url
<< "): Size cannot be determined");
return n;
@@ -310,7 +310,7 @@ sal_Int64 utl::UCBContentHelper::GetSize(rtl::OUString const & url) {
} catch (css::uno::Exception const &) {
css::uno::Any e(cppu::getCaughtException());
SAL_INFO(
- "unotools",
+ "unotools.ucbhelper",
"UCBContentHelper::GetSize(" << url << ") "
<< e.getValueType().getTypeName() << " \""
<< e.get<css::uno::Exception>().Message << '"');
@@ -339,7 +339,7 @@ bool utl::UCBContentHelper::IsYounger(
} catch (css::uno::Exception const &) {
css::uno::Any e(cppu::getCaughtException());
SAL_INFO(
- "unotools",
+ "unotools.ucbhelper",
"UCBContentHelper::IsYounger(" << younger << ", " << older << ") "
<< e.getValueType().getTypeName() << " \""
<< e.get<css::uno::Exception>().Message << '"');
@@ -429,7 +429,7 @@ bool utl::UCBContentHelper::IsSubPath(
} catch (css::uno::Exception const &) {
css::uno::Any e(cppu::getCaughtException());
SAL_INFO(
- "unotools",
+ "unotools.ucbhelper",
"UCBContentHelper::IsSubPath(" << parent << ", " << child << ") "
<< e.getValueType().getTypeName() << " \""
<< e.get<css::uno::Exception>().Message << '"');
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index a925ded..5fbe862 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2357,7 +2357,7 @@ std::vector< RadioButton* > RadioButton::GetRadioButtonGroup(bool bIncludeThis)
}
//old-school
- SAL_WARN("vcl", "No new-style group set on radiobutton, using old-style digging around");
+ SAL_WARN("vcl.control", "No new-style group set on radiobutton, using old-style digging around");
// go back to first in group;
Window* pFirst = const_cast<RadioButton*>(this);
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 1b57531..17cc412 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -642,7 +642,7 @@ sal_Bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint )
//stupidly big, forget about it
if (maTargetSize.Width() >= SAL_MAX_INT32 / nBytesPerPixel / maTargetSize.Height())
{
- SAL_WARN( "vcl", "overlarge png dimensions: " <<
+ SAL_WARN( "vcl.gdi", "overlarge png dimensions: " <<
maTargetSize.Width() << " x " << maTargetSize.Height() << " depth: " << mnTargetDepth);
return sal_False;
}
commit 4b712afcabec26e3165d3c7022c8696f28f5bf58
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Feb 23 13:28:49 2013 +0100
Translate German comments
Change-Id: I0c2e38e07c0e108268d63c1994eb3a0a0646cdf5
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 614cd91..2b3c32e 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -159,7 +159,7 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet )
bool bProtected = false;
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB i=0; i<nTabCount; i++)
- if (pDoc->IsTabProtected(i)) // ueberhaupt eine Tabelle geschuetzt?
+ if (pDoc->IsTabProtected(i)) // look after protected table
bProtected = true;
SfxWhichIter aIter(rSet);
@@ -179,7 +179,7 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet )
rSet.DisableItem( nSlotId );
break;
- case SID_STYLE_FAMILY2: // Zellvorlagen
+ case SID_STYLE_FAMILY2: // cell style sheets
{
SfxStyleSheet* pStyleSheet = (SfxStyleSheet*)
pTabViewShell->GetStyleSheetFromMarked();
@@ -191,7 +191,7 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet )
}
break;
- case SID_STYLE_FAMILY4: // Seitenvorlagen
+ case SID_STYLE_FAMILY4: // page style sheets
{
SCTAB nCurTab = GetViewData()->GetTabNo();
String aPageStyle = pDoc->GetPageStyle( nCurTab );
@@ -248,7 +248,7 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet )
void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
{
- // Wenn ToolBar vertikal :
+ // in case of vertical toolbar
if ( !rReq.GetArgs() )
{
pViewData->GetDispatcher().Execute( SID_STYLE_DESIGNER, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
@@ -416,7 +416,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
break;
}
- // Neuen Style fuer WaterCan-Mode setzen
+ // set new style for WaterCan-Mode
if ( nSlotId == SID_STYLE_APPLY && pScMod->GetIsWaterCan() && pStyleSheet )
((ScStyleSheetPool*)pStylePool)->SetActualStyleSheet( pStyleSheet );
@@ -460,7 +460,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
{
if ( pStyleSheet && !pScMod->GetIsWaterCan() )
{
- // Anwenden der Vorlage auf das Dokument
+ // apply style sheet to document
pTabViewShell->SetStyleSheetToMarked( (SfxStyleSheet*)pStyleSheet );
pTabViewShell->InvalidateAttribs();
rReq.Done();
@@ -471,8 +471,8 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
case SID_STYLE_NEW_BY_EXAMPLE:
case SID_STYLE_UPDATE_BY_EXAMPLE:
{
- // Vorlage erzeugen/ersetzen durch Attribute
- // an der Cursor-Position:
+ // create/replace style sheet by attributes
+ // at cursor position:
const ScPatternAttr* pAttrItem = NULL;
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 72d8f20..687b527 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -101,7 +101,7 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); }
//-------------------------------------------------------------------------
IMPL_CHILD_CTOR( ScNameDlgWrapper, FID_DEFINE_NAME )
- //
+
//-------------------------------------------------------------------------
// ScNameDlgWrapper
//-------------------------------------------------------------------------
@@ -296,7 +296,7 @@ void ScSimpleRefDlgWrapper::StartRefInput()
//-------------------------------------------------------------------------
-// ScAcceptChgDlgWrapper //Kommentar: sollte in die ViewShell
+// ScAcceptChgDlgWrapper //FIXME: should be moved into ViewShell
//-------------------------------------------------------------------------
ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP,
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 24866e1..d991b12 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -45,7 +45,7 @@ static sal_Bool bDidSwitch = false;
// -----------------------------------------------------------------------
//
-// View (Gridwin / Tastatur)
+// View (Gridwin / keyboard)
//
ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) :
@@ -54,7 +54,7 @@ ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) :
bAnchor( false ),
bStarted( false )
{
- OSL_ENSURE(pViewData, "ViewData==0 bei FunctionSet");
+ OSL_ENSURE(pViewData, "ViewData==0 at FunctionSet");
}
ScSplitPos ScViewFunctionSet::GetWhich()
@@ -299,11 +299,11 @@ sal_Bool ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool
if ( bDidSwitch )
{
if ( rPointPixel == aSwitchPos )
- return false; // nicht auf falschem Fenster scrollen
+ return false; // don't scroll in wrong window
else
bDidSwitch = false;
}
- aSwitchPos = rPointPixel; // nur wichtig, wenn bDidSwitch
+ aSwitchPos = rPointPixel; // only important, if bDidSwitch
// treat position 0 as -1, so scrolling is always possible
// (with full screen and hidden headers, the top left border may be at 0)
@@ -327,10 +327,10 @@ sal_Bool ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool
SCsCOL nPosX;
SCsROW nPosY;
pViewData->GetPosFromPixel( aEffPos.X(), aEffPos.Y(), GetWhich(),
- nPosX, nPosY, sal_True, sal_True ); // mit Repair
+ nPosX, nPosY, sal_True, sal_True ); // with Repair
- // fuer AutoFill in der Mitte der Zelle umschalten
- // dabei aber nicht das Scrolling nach rechts/unten verhindern
+ // for Autofill switch in the center of cell
+ // thereby don't prevent scrolling to bottom/right
if ( pViewData->IsFillMode() || pViewData->GetFillMode() == SC_FILL_MATRIX )
{
sal_Bool bLeft, bTop;
@@ -348,10 +348,10 @@ sal_Bool ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool
nPosY = -1;
}
}
- // negativ ist erlaubt
+ // negative value is allowed
}
- // ueber Fixier-Grenze bewegt?
+ // moved out of fix limit?
ScSplitPos eWhich = GetWhich();
if ( eWhich == pViewData->GetActivePart() )
@@ -454,7 +454,7 @@ sal_Bool ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Boo
else if (pViewData->IsFillMode() ||
(pViewData->GetFillMode() == SC_FILL_MATRIX && (nScFillModeMouseModifier & KEY_MOD1) ))
{
- // Wenn eine Matrix angefasst wurde, kann mit Ctrl auf AutoFill zurueckgeschaltet werden
+ // If a matrix got touched, switch back to Autofill is possible with Ctrl
SCCOL nStartX, nEndX;
SCROW nStartY, nEndY; // Block
@@ -472,9 +472,9 @@ sal_Bool ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Boo
if ( nPosX+1 >= (SCsCOL) nStartX && nPosX <= (SCsCOL) nEndX &&
nPosY+1 >= (SCsROW) nStartY && nPosY <= (SCsROW) nEndY &&
- ( nPosX != nEndX || nPosY != nEndY ) ) // verkleinern ?
+ ( nPosX != nEndX || nPosY != nEndY ) ) // minimize?
{
- // Richtung (links oder oben)
+ // direction (left or top)
long nSizeX = 0;
for (SCCOL i=nPosX+1; i<=nEndX; i++)
@@ -487,14 +487,14 @@ sal_Bool ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Boo
nDelStartX = nPosX + 1;
else
nDelStartY = nPosY + 1;
- // 0 braucht nicht mehr getrennt abgefragt zu werden, weil nPosX/Y auch negativ wird
+ // there is no need to check for zero, because nPosX/Y is also negative
if ( nDelStartX < nStartX )
nDelStartX = nStartX;
if ( nDelStartY < nStartY )
nDelStartY = nStartY;
- // Bereich setzen
+ // set range
pViewData->SetDelMark( ScRange( nDelStartX,nDelStartY,nTab,
nEndX,nEndY,nTab ) );
@@ -503,10 +503,10 @@ sal_Bool ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Boo
pViewData->GetView()->
PaintArea( nStartX,nDelStartY, nEndX,nEndY, SC_UPDATE_MARKS );
- nPosX = nEndX; // roten Rahmen um ganzen Bereich lassen
+ nPosX = nEndX; // keep red border around range
nPosY = nEndY;
- // Referenz wieder richtigherum, falls unten umgedreht
+ // reference the right way up, if it's upside down below
if ( nStartX != pViewData->GetRefStartX() || nStartY != pViewData->GetRefStartY() )
{
pViewData->GetView()->DoneRefMode();
@@ -553,7 +553,7 @@ sal_Bool ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Boo
else
nSizeY += pDoc->GetRowHeight( nEndY+1, nPosY, nTab );
- if ( nSizeX > nSizeY ) // Fill immer nur in einer Richtung
+ if ( nSizeX > nSizeY ) // Fill only ever in one direction
{
nPosY = nEndY;
bNegY = false;
@@ -613,14 +613,14 @@ sal_Bool ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, sal_Boo
pView->UpdateRef( nPosX, nPosY, nTab );
}
- // else neue Modi
+ // else new modes
}
- else // normales Markieren
+ else // regular selection
{
sal_Bool bHideCur = bAnchor && ( (SCCOL)nPosX != pViewData->GetCurX() ||
(SCROW)nPosY != pViewData->GetCurY() );
if (bHideCur)
- pView->HideAllCursors(); // sonst zweimal: Block und SetCursor
+ pView->HideAllCursors(); // otherwise twice: Block and SetCursor
if (bAnchor)
{
@@ -712,7 +712,7 @@ sal_Bool ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel )
void ScViewFunctionSet::DeselectAtPoint( const Point& /* rPointPixel */ )
{
- // gibt's nicht
+ // doesn't exist
}
void ScViewFunctionSet::DeselectAll()
@@ -741,7 +741,6 @@ ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView,
SelectionEngine( pWindow, pView->GetFunctionSet() ),
eWhich( eSplitPos )
{
- // Parameter einstellen
SetSelectionMode( MULTIPLE_SELECTION );
EnableDrag( sal_True );
}
@@ -750,7 +749,7 @@ ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView,
//------------------------------------------------------------------------
//
-// Spalten- / Zeilenheader
+// column and row headers
//
ScHeaderFunctionSet::ScHeaderFunctionSet( ScViewData* pNewViewData ) :
@@ -760,7 +759,7 @@ ScHeaderFunctionSet::ScHeaderFunctionSet( ScViewData* pNewViewData ) :
bAnchor( false ),
nCursorPos( 0 )
{
- OSL_ENSURE(pViewData, "ViewData==0 bei FunctionSet");
+ OSL_ENSURE(pViewData, "ViewData==0 at FunctionSet");
}
void ScHeaderFunctionSet::SetColumn( sal_Bool bSet )
@@ -775,7 +774,7 @@ void ScHeaderFunctionSet::SetWhich( ScSplitPos eNew )
void ScHeaderFunctionSet::BeginDrag()
{
- // gippsnich
+ // doesn't exist
}
void ScHeaderFunctionSet::CreateAnchor()
@@ -808,9 +807,9 @@ sal_Bool ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bo
{
if ( bDidSwitch )
{
- // die naechste gueltige Position muss vom anderen Fenster kommen
+ // next valid position has to be originated from another window
if ( rPointPixel == aSwitchPos )
- return false; // nicht auf falschem Fenster scrollen
+ return false; // don't scroll in the wrong window
else
bDidSwitch = false;
}
@@ -824,7 +823,7 @@ sal_Bool ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bo
else
bScroll = ( rPointPixel.Y() < 0 || rPointPixel.Y() >= aWinSize.Height() );
- // ueber Fixier-Grenze bewegt?
+ // moved out of fix limit?
sal_Bool bSwitched = false;
if ( bColumn )
@@ -840,7 +839,7 @@ sal_Bool ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bo
}
}
}
- else // Zeilenkoepfe
+ else // column headers
{
if ( pViewData->GetVSplitMode() == SC_SPLIT_FIX )
{
@@ -857,11 +856,9 @@ sal_Bool ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bo
{
aSwitchPos = rPointPixel;
bDidSwitch = sal_True;
- return false; // nicht mit falschen Positionen rechnen
+ return false; // do not crunch with wrong positions
}
- //
-
SCsCOL nPosX;
SCsROW nPosY;
pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), pViewData->GetActivePart(),
@@ -890,7 +887,7 @@ sal_Bool ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bo
if ( !bAnchor || !pView->IsBlockMode() )
{
pView->DoneBlockMode( sal_True );
- pViewData->GetMarkData().MarkToMulti(); //! wer verstellt das ???
+ pViewData->GetMarkData().MarkToMulti(); //! who changes this?
pView->InitBlockMode( nPosX, nPosY, pViewData->GetTabNo(), sal_True, bColumn, !bColumn );
bAnchor = sal_True;
@@ -898,7 +895,7 @@ sal_Bool ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bo
pView->MarkCursor( nPosX, nPosY, pViewData->GetTabNo(), bColumn, !bColumn );
- // SelectionChanged innerhalb von HideCursor wegen UpdateAutoFillMark
+ // SelectionChanged inside of HideCursor because of UpdateAutoFillMark
pView->SelectionChanged();
if (bHide)
@@ -936,13 +933,8 @@ void ScHeaderFunctionSet::DeselectAll()
ScHeaderSelectionEngine::ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunctionSet* pFuncSet ) :
SelectionEngine( pWindow, pFuncSet )
{
- // Parameter einstellen
SetSelectionMode( MULTIPLE_SELECTION );
EnableDrag( false );
}
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list