Skip to content

C
core
Kaydet (Commit) 746e9a7d authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

allow unsetting database settings without warnings

üst 51f8f151
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
sw/source/ui/uno/SwXDocumentSettings.cxx
Dosyayı görüntüle @ 746e9a7d
......@@ -474,21 +474,23 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
case HANDLE_CURRENT_DATABASE_COMMAND:
{
SwDBData aData = mpDoc->GetDBData();
SAL_WARN_IF( aData.sDataSource.isEmpty(), "sw.uno",
"\"CurrentDatabaseCommand\" property possibly set before \"CurrentDatabaseDataSource\"" );
if ( rValue >>= aData.sCommand )
mpDoc->ChgDBData( aData );
SAL_WARN_IF( aData.sDataSource.isEmpty() && !aData.sCommand.isEmpty(), "sw.uno",
"\"CurrentDatabaseCommand\" property possibly set before \"CurrentDatabaseDataSource\"" );
}
break;
case HANDLE_CURRENT_DATABASE_COMMAND_TYPE:
{
SwDBData aData = mpDoc->GetDBData();
SAL_WARN_IF( aData.sDataSource.isEmpty(), "sw.uno",
"\"CurrentDatabaseCommandType\" property possibly set before \"CurrentDatabaseDataSource\"" );
SAL_WARN_IF( aData.sCommand.isEmpty(), "sw.uno",
"\"CurrentDatabaseCommandType\" property possibly set before \"CurrentDatabaseCommand\"" );
if ( rValue >>= aData.nCommandType )
mpDoc->ChgDBData( aData );
SAL_WARN_IF( aData.nCommandType && aData.sDataSource.isEmpty(), "sw.uno",
"\"CurrentDatabaseCommandType\" property possibly set before \"CurrentDatabaseDataSource\"" );
SAL_WARN_IF( aData.nCommandType && aData.sCommand.isEmpty(), "sw.uno",
"\"CurrentDatabaseCommandType\" property possibly set before \"CurrentDatabaseCommand\"" );
}
break;
case HANDLE_SAVE_VERSION_ON_CLOSE:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment