[Libreoffice-commits] .: 8 commits - avmedia/source desktop/source editeng/source formula/source framework/source linguistic/source sfx2/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Nov 12 05:37:35 PST 2010
avmedia/source/gstreamer/gstwindow.cxx | 6 +++---
avmedia/source/viewer/mediawindow.cxx | 4 ++--
desktop/source/so_comp/evaluation.cxx | 2 +-
desktop/source/so_comp/oemjob.cxx | 2 +-
editeng/source/misc/svxacorr.cxx | 2 +-
formula/source/ui/dlg/formula.cxx | 2 +-
framework/source/uielement/statusbarmanager.cxx | 2 +-
linguistic/source/lngopt.cxx | 12 +++---------
sfx2/source/control/macro.cxx | 2 +-
9 files changed, 14 insertions(+), 20 deletions(-)
New commits:
commit c2aeb3007de725b9dd8b7771d11cebfcba076bf5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 13:17:33 2010 +0000
Resolves: rhbz#647392# Ensure autocorrect doesn't crash
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index b80ba29..6578732 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -690,7 +690,7 @@ BOOL SvxAutoCorrect::FnAddNonBrkSpace(
bRunNext = true;
}
}
- else if ( cChar == '/' )
+ else if (cChar == '/' && nEndPos >= 2)
{
// Remove the hardspace right before to avoid formatting URLs
sal_Unicode cPrevChar = rTxt.GetChar( nEndPos - 1 );
commit 34ef0f5df244acf980a2122507a797f7c6e96824
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 11:30:36 2010 +0000
WaE, unused parameters
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 5385d40..4e0f6f3 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -133,7 +133,7 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
// XWindow
// ------------------------------------------------------------------------------
-void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
+void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 /*Width*/, sal_Int32 /*Height*/, sal_Int16 /*Flags*/ )
throw (uno::RuntimeException)
{
// if( mnFrameWnd )
@@ -173,7 +173,7 @@ awt::Rectangle SAL_CALL Window::getPosSize()
// ------------------------------------------------------------------------------
-void SAL_CALL Window::setVisible( sal_Bool bVisible )
+void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ )
throw (uno::RuntimeException)
{
// if( mnFrameWnd )
@@ -189,7 +189,7 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible )
// ------------------------------------------------------------------------------
-void SAL_CALL Window::setEnable( sal_Bool bEnable )
+void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ )
throw (uno::RuntimeException)
{
// if( mnFrameWnd )
commit 7fc3d2f4e903ed790d2dc3d2a6a0478a519decb9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 11:30:08 2010 +0000
RTL_CONSTASCII_USTRINGPARAM used with nonarray
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index f413303..2e20ead 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -382,8 +382,8 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
for( i = 0; i < ( sizeof( pFilters ) / sizeof( char* ) ); i += 2 )
{
rFilterNameVector.push_back( ::std::make_pair< ::rtl::OUString, ::rtl::OUString >(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( pFilters[ i ] )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( pFilters[ i + 1 ] )) ) );
+ ::rtl::OUString::createFromAscii(pFilters[i]),
+ ::rtl::OUString::createFromAscii(pFilters[i+1]) ) );
}
}
commit f0d38642317920288ed1ff89cfe4a108dab9dbdb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 11:27:06 2010 +0000
RTL_CONSTASCII_USTRINGPARAM used with nonarray
diff --git a/desktop/source/so_comp/evaluation.cxx b/desktop/source/so_comp/evaluation.cxx
index 95c50f7..ac38a12 100644
--- a/desktop/source/so_comp/evaluation.cxx
+++ b/desktop/source/so_comp/evaluation.cxx
@@ -67,7 +67,7 @@ const char* SOEvaluation::serviceName = "com.sun.star.office.Evaluation";
OUString SOEvaluation::GetImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( implementationName));
+ return OUString::createFromAscii(implementationName);
}
Sequence< OUString > SOEvaluation::GetSupportedServiceNames()
diff --git a/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx
index 13ab666..4e9ec6c 100644
--- a/desktop/source/so_comp/oemjob.cxx
+++ b/desktop/source/so_comp/oemjob.cxx
@@ -68,7 +68,7 @@ const char* OEMPreloadJob::serviceName = "com.sun.star.office.OEMPreloadJob";
OUString OEMPreloadJob::GetImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( implementationName));
+ return OUString::createFromAscii(implementationName);
}
Sequence< OUString > OEMPreloadJob::GetSupportedServiceNames()
commit 992f9f20d11c5153edefc069735c0e5e670cc735
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 11:25:28 2010 +0000
WaE, unused parameter
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index d8e7fa9..e6d9715 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1665,7 +1665,7 @@ BOOL FormulaDlg_Impl::CheckMatrix(String& aFormula)
aTabCtrl.SetCurPageId(TP_STRUCT);
return bMatrix;
}
-IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, pStruP )
+IMPL_LINK( FormulaDlg_Impl, StructSelHdl, StructPage*, EMPTYARG )
{
bStructUpdate=FALSE;
if(pStructPage->IsVisible()) aBtnForward.Enable(FALSE); //@New
commit 73e6cd21c14d38a1c5f38c756b73450f583199e7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 11:24:14 2010 +0000
RTL_CONSTASCII_USTRINGPARAM used with nonarray
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index d75d6d2..d2f2cfb 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -79,7 +79,7 @@ using namespace ::com::sun::star;
#endif
const sal_Int32 HELPID_PREFIX_LENGTH = 7;
-static const char* HELPID_PREFIX = "helpid:";
+static const char HELPID_PREFIX[] = "helpid:";
// Property names of a menu/menu item ItemDescriptor
static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL";
commit 821217b34e107e2008b4884febe86b35cf8645ed
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 11:23:45 2010 +0000
RTL_CONSTASCII_USTRINGPARAM used with nonarray
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 00f0743..7a1cbb5 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -300,16 +300,10 @@ OUString LinguOptions::GetName( INT32 nWID )
OUString aRes;
INT32 nLen = SAL_N_ELEMENTS( aWID_Name );
- if (0 <= nWID && nWID < nLen
- && aWID_Name[ nWID ].nWID == nWID)
- {
- aRes = OUString( RTL_CONSTASCII_USTRINGPARAM(
- aWID_Name[ nWID ].pPropertyName ) );
- }
+ if (0 <= nWID && nWID < nLen && aWID_Name[ nWID ].nWID == nWID)
+ aRes = OUString::createFromAscii(aWID_Name[nWID].pPropertyName);
else
- {
- DBG_ASSERT( 0,"lng : unknown WID");
- }
+ OSL_ENSURE(false, "lng : unknown WID");
return aRes;
}
commit 2cebe7cdf7e1c04feea05f8b1545c8a47fe8e5c5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 11:20:10 2010 +0000
RTL_CONSTASCII_USTRINGPARAM used with nonarray
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 2031b42..3990e3a 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -381,7 +381,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
USHORT nPos = 0;
while ( TRUE )
{
- nPos = aRecordable.SearchAndReplace( DEFINE_CONST_UNICODE('"'), DEFINE_CONST_UNICODE("\"\""), nPos );
+ nPos = aRecordable.SearchAndReplace( String('"'), DEFINE_CONST_UNICODE("\"\""), nPos );
if ( STRING_NOTFOUND == nPos )
break;
nPos += 2;
More information about the Libreoffice-commits
mailing list