[Libreoffice-commits] core.git: extensions/source

[Caolán McNamara]

 extensions/source/propctrlr/formcomponenthandler.cxx |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 9a0f19c5f6f392928d4134443e2c48978a46be51
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 4 15:44:11 2017 +0100

    well, its on the main trunk now
    
    and we're not changing it at this point
    
    Change-Id: Icb0cbe4728f64c2070780ad63b888e5d229c6216

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 3a6f83f0bdb4..4cdafc25a6b9 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -877,17 +877,13 @@ namespace pcr
                 break;
 
             case PROPERTY_ID_LISTSOURCE:
-                // no cursor source if no Base is installed. #124939#
-                // This fix is not intended to appear on the main trunk. If you find it there,
-                // please tell me! frank.schoenheit at sun.com
+                // no cursor source if no Base is installed.
                 if ( SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) )
                     const_cast< FormComponentPropertyHandler* >( this )->m_bHaveListSource = true;
                 break;
 
             case PROPERTY_ID_COMMAND:
-                // no cursor source if no Base is installed. #124939#
-                // This fix is not intended to appear on the main trunk. If you find it there,
-                // please tell me! frank.schoenheit at sun.com
+                // no cursor source if no Base is installed.
                 if ( SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) )
                     const_cast< FormComponentPropertyHandler* >( this )->m_bHaveCommand = true;
                 break;
@@ -2272,9 +2268,7 @@ namespace pcr
                 return true;
         }
 
-        // no data properties if no Base is installed. #124939#
-        // This fix is not intended to appear on the main trunk. If you find it there,
-        // please tell me! frank.schoenheit at sun.com
+        // no data properties if no Base is installed.
         if ( ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0 )
             if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::EModule::DATABASE ) )
                 return true;