Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/components

extensions/source/propctrlr/browserline.cxx

@@ -412,7 +412,9 @@ namespace pcr
         return *rpButton;
     }
 
-    //------------------------------------------------------------------
+/**
+ * @param _out_rHCImage is unused now as there are no highcontrast variants
+ */
     void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage )
     {
         try
@@ -426,23 +428,6 @@ namespace pcr
 
             Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW );
             _out_rImage = _out_rHCImage = Image( xGraphic );
-
-            // see if we find an HC version beside the normal graphic
-            INetURLObject aURL( _rImageURL );
-            ::rtl::OUString sBaseName( aURL.getBase() );
-            aURL.setBase( sBaseName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_hc" ) ) );
-            ::rtl::OUString sHCImageURL( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
-
-            Reference< XGraphic > xHCGraphic;
-            try
-            {
-                aMediaProperties[0].Value <<= sHCImageURL;
-                xHCGraphic = xGraphicProvider->queryGraphic( aMediaProperties );
-            }
-            catch( const Exception& ) { }
-
-            if ( xHCGraphic.is() )
-                _out_rHCImage = Image( xHCGraphic );
         }
         catch( const Exception& )
         {

forms/source/component/GroupManager.cxx

@@ -121,11 +121,11 @@ OGroupComp::OGroupComp(const OGroupComp& _rSource)
 
 //------------------------------------------------------------------
 OGroupComp::OGroupComp(const Reference<XPropertySet>& rxSet, sal_Int32 nInsertPos )
-    :m_xComponent( rxSet )
-    ,m_xControlModel(rxSet,UNO_QUERY)
-    ,m_nPos( nInsertPos )
-    ,m_nTabIndex(0)
-    ,m_aName( OGroupManager::GetGroupName( rxSet ) )
+    : m_aName( OGroupManager::GetGroupName( rxSet ) )
+    , m_xComponent( rxSet )
+    , m_xControlModel(rxSet,UNO_QUERY)
+    , m_nPos( nInsertPos )
+    , m_nTabIndex(0)
 {
     if (m_xComponent.is())
     {

wizards/source/formwizard/Language.xba

@@ -112,8 +112,8 @@ Dim slblFields as String
 		.optAlign2.Label = GetResText(RID_FORM + 34)
 		.optAlign0.State = 1
 		
+                //FIXME: Remove this unused FNameAddOn through the file
 		FNameAddOn = ""
-		If isHighContrast(DlgFormDB.getPeer) Then FNameAddOn = "_hc"
 
 		IDArray = Array(36, 37, 40, 38, 39)
 		For i = 1 To 5